summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/drivers/usb/host/adm5120.h
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-29 07:36:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-29 07:36:43 +0000
commite96d52d198511789d66d8fb7bd9a0f3c3c9c0107 (patch)
treea91c5c6dbd1ccf52974ba5063918e1c171ebeb1a /target/linux/adm5120/files/drivers/usb/host/adm5120.h
parent19be4923e0a2dfa6dd173288fc0ead976a0f2b38 (diff)
downloadmaster-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.gz
master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.bz2
master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.zip
adm5120: merge 3.3 patches
SVN-Revision: 31511
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120.h')
-rw-r--r--target/linux/adm5120/files/drivers/usb/host/adm5120.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120.h b/target/linux/adm5120/files/drivers/usb/host/adm5120.h
index 52fe039f4d..e47aac8e7a 100644
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120.h
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120.h
@@ -403,6 +403,7 @@ struct admhcd {
* other external transceivers should be software-transparent
*/
struct otg_transceiver *transceiver;
+ void (*start_hnp)(struct admhcd *ahcd);
#endif
/*
@@ -537,15 +538,7 @@ static inline struct usb_hcd *admhcd_to_hcd(const struct admhcd *ahcd)
* Big-endian read/write functions are arch-specific.
* Other arches can be added if/when they're needed.
*
- * REVISIT: arch/powerpc now has readl/writel_be, so the
- * definition below can die once the STB04xxx support is
- * finally ported over.
*/
-#if defined(CONFIG_PPC) && !defined(CONFIG_PPC_MERGE)
-#define readl_be(addr) in_be32((__force unsigned *)addr)
-#define writel_be(val, addr) out_be32((__force unsigned *)addr, val)
-#endif
-
static inline unsigned int admhc_readl(const struct admhcd *ahcd,
__hc32 __iomem *regs)
{