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

Commit bd688268 authored by Felipe Contreras's avatar Felipe Contreras Committed by Greg Kroah-Hartman
Browse files

usb: gadget: fix Kconfig warning 



warning: (USB_MUSB_HDRC_HCD && USB_SUPPORT && USB_MUSB_HDRC &&
(USB_MUSB_HOST || USB_MUSB_OTG) && USB_GADGET_MUSB_HDRC || USB_MUSB_OTG
&& <choice> && USB && USB_GADGET && PM && EXPERIMENTAL) selects USB_OTG
which has unmet direct dependencies (USB_GADGET_OMAP && ARCH_OMAP_OTG &&
USB_OHCI_HCD)

This doesn't seem to happen on 2.6.36-rc8, but still doesn't make sense
to keep this duplicated config that is already defined in usb/core.

Signed-off-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e576a7a9

drivers/usb/gadget/Kconfig

+0 −11
Original line number Original line Diff line number Diff line
@@ -210,17 +210,6 @@ config USB_OMAP 
	default USB_GADGET

	default USB_GADGET

	select USB_GADGET_SELECTED

	select USB_GADGET_SELECTED





config USB_OTG

	boolean "OTG Support"

	depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD

	help

	   The most notable feature of USB OTG is support for a

	   "Dual-Role" device, which can act as either a device

	   or a host.  The initial role choice can be changed

	   later, when two dual-role devices talk to each other.



	   Select this only if your OMAP board has a Mini-AB connector.



config USB_GADGET_PXA25X

config USB_GADGET_PXA25X

	boolean "PXA 25x or IXP 4xx"

	boolean "PXA 25x or IXP 4xx"

	depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX

	depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX