Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09fa14aa authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

USB: drivers/usb/musb/: disable it on SuperH 



In file included from drivers/usb/musb/musb_core.h:59,
                 from drivers/usb/musb/musb_core.c:108:
drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl'
/usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here
drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl'
/usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here
drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsw'
/usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'readsw' was here
drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsb'
/usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'readsb' was here
drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl'
/usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here
drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl'
/usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here
drivers/usb/musb/musb_io.h:51: error: conflicting types for 'writesw'
/usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'writesw' was here
drivers/usb/musb/musb_io.h:53: error: conflicting types for 'writesb'
/usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'writesb' was here

Cc: Karsten Keil <kkeil@suse.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b77a5c70

drivers/usb/musb/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ comment "Enable Host or Gadget support to see Inventra options" 
# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller

# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller

config USB_MUSB_HDRC

config USB_MUSB_HDRC

	depends on (USB || USB_GADGET) && HAVE_CLK

	depends on (USB || USB_GADGET) && HAVE_CLK

	depends on !SUPERH

	select TWL4030_USB if MACH_OMAP_3430SDP

	select TWL4030_USB if MACH_OMAP_3430SDP

	tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'

	tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'

	help

	help