diff options
| author | Nicolas Ferre | 2012-03-01 13:24:22 +0100 |
|---|---|---|
| committer | Nicolas Ferre | 2012-03-01 13:26:51 +0100 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /drivers/usb/musb/musb_io.h | |
| parent | Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9... (diff) | |
| parent | mfd: twl-core: Add IRQ_DOMAIN dependency (diff) | |
| download | kernel-qcow2-linux-89d4a1753b6632327f18d6c8e0842b366b736621.tar.gz kernel-qcow2-linux-89d4a1753b6632327f18d6c8e0842b366b736621.tar.xz kernel-qcow2-linux-89d4a1753b6632327f18d6c8e0842b366b736621.zip | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6
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 @@ #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ - && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) + && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \ + && !defined(CONFIG_MIPS) static inline void readsl(const void __iomem *addr, void *buf, int len) { insl((unsigned long)addr, buf, len); } static inline void readsw(const void __iomem *addr, void *buf, int len) |