diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:18 -0500 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /drivers/usb/musb/musb_io.h | |
| parent | 7dae8c5209147ad06d424928a5f1ec45caa87691 (diff) | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/musb/musb_io.h')
| -rw-r--r-- | drivers/usb/musb/musb_io.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h index e61aa95f2d2a..1d5eda26fbd1 100644 --- a/drivers/usb/musb/musb_io.h +++ b/drivers/usb/musb/musb_io.h | |||
| @@ -39,7 +39,8 @@ | |||
| 39 | 39 | ||
| 40 | #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ | 40 | #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ |
| 41 | && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ | 41 | && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ |
| 42 | && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) | 42 | && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \ |
| 43 | && !defined(CONFIG_MIPS) | ||
| 43 | static inline void readsl(const void __iomem *addr, void *buf, int len) | 44 | static inline void readsl(const void __iomem *addr, void *buf, int len) |
| 44 | { insl((unsigned long)addr, buf, len); } | 45 | { insl((unsigned long)addr, buf, len); } |
| 45 | static inline void readsw(const void __iomem *addr, void *buf, int len) | 46 | static inline void readsw(const void __iomem *addr, void *buf, int len) |