]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
usb: musb: fix a build error on mips
authorCong Wang <xiyou.wangcong@gmail.com>
Fri, 3 Feb 2012 07:14:17 +0000 (15:14 +0800)
committerFelipe Balbi <balbi@ti.com>
Fri, 3 Feb 2012 07:29:13 +0000 (09:29 +0200)
commit976d98cb726601972fafb28173d4526ce3603415
treec7564c4eb0e5665b7a9a6d08db454691eb17ce3e
parentaa3e8b4e715d0781a4e6cd1bb7570410209f0ba8
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>
drivers/usb/musb/musb_io.h