diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-29 07:36:43 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-29 07:36:43 +0000 |
| commit | 0c3e51f31ceb672b391aa4b4086ab5e0edf07fc1 (patch) | |
| tree | 15e272500401e7847d9ea7dc40a0fafb81f93c1d /target/linux/adm5120/files/drivers/usb/host/adm5120.h | |
| parent | 71b94eaba41e5b7d038d3ad09a404316d9430ae5 (diff) | |
adm5120: merge 3.3 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120.h')
| -rw-r--r-- | target/linux/adm5120/files/drivers/usb/host/adm5120.h | 9 |
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 52fe039f4..e47aac8e7 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) { |