diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2012-02-03 15:14:17 +0800 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-02-03 09:29:13 +0200 |
| commit | 976d98cb726601972fafb28173d4526ce3603415 (patch) | |
| tree | c7564c4eb0e5665b7a9a6d08db454691eb17ce3e /drivers/usb/musb/musb_io.h | |
| parent | aa3e8b4e715d0781a4e6cd1bb7570410209f0ba8 (diff) | |
| download | blackbird-op-linux-976d98cb726601972fafb28173d4526ce3603415.tar.gz blackbird-op-linux-976d98cb726601972fafb28173d4526ce3603415.zip | |
usb: musb: fix a build error on mips
On mips, we got:
drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsl'
arch/mips/include/asm/io.h:529: error: previous definition of 'readsl' was here
drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsw'
arch/mips/include/asm/io.h:528: error: previous definition of 'readsw' was here
drivers/usb/musb/musb_io.h:48: error: conflicting types for 'readsb'
so, should add !defined(CONFIG_MIPS) too.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
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) |
