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

Commit ccd9509a authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: fix Kconfig logic for USB_UHCI_HCD 



The Kconfig settings for uhci-hcd are too permissive; they allow the
driver to be built without any bus-glue modules configured
(USB_UHCI_HCD enabled, PCI disabled, SPARC_LEON disabled, ARCH_VT8500
enabled, and USB_UHCI_PLATFORM disabled).

This patch fixes the problem by rearranging the dependencies.  Now the
platform-dependent config options don't depend on USB_UHCI_HCD;
instead it depends on them.  Furthermore, there is no user-selectable
choice as to which glue modules will be built.  If USB_UHCI_HCD is
enabled then all applicable bus glues will be built.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4f47e36

drivers/usb/host/Kconfig

+5 −12
Original line number Original line Diff line number Diff line
@@ -507,7 +507,7 @@ endif # USB_OHCI_HCD 




config USB_UHCI_HCD

config USB_UHCI_HCD

	tristate "UHCI HCD (most Intel and VIA) support"

	tristate "UHCI HCD (most Intel and VIA) support"

	depends on PCI || SPARC_LEON || ARCH_VT8500

	depends on PCI || USB_UHCI_SUPPORT_NON_PCI_HC

	---help---

	---help---

	  The Universal Host Controller Interface is a standard by Intel for

	  The Universal Host Controller Interface is a standard by Intel for

	  accessing the USB hardware in the PC (which is also called the USB

	  accessing the USB hardware in the PC (which is also called the USB
@@ -524,26 +524,19 @@ config USB_UHCI_HCD 




config USB_UHCI_SUPPORT_NON_PCI_HC

config USB_UHCI_SUPPORT_NON_PCI_HC

	bool

	bool

	depends on USB_UHCI_HCD

	default y if (SPARC_LEON || USB_UHCI_PLATFORM)

	default y if (SPARC_LEON || ARCH_VT8500)





config USB_UHCI_PLATFORM

config USB_UHCI_PLATFORM

	bool "Generic UHCI Platform Driver support"

	bool

	depends on USB_UHCI_SUPPORT_NON_PCI_HC

	default y if ARCH_VT8500

	default y if ARCH_VT8500

	---help---

	  Enable support for generic UHCI platform devices that require no

	  additional configuration.





config USB_UHCI_BIG_ENDIAN_MMIO

config USB_UHCI_BIG_ENDIAN_MMIO

	bool

	bool

	depends on USB_UHCI_SUPPORT_NON_PCI_HC && SPARC_LEON

	default y if SPARC_LEON

	default y





config USB_UHCI_BIG_ENDIAN_DESC

config USB_UHCI_BIG_ENDIAN_DESC

	bool

	bool

	depends on USB_UHCI_SUPPORT_NON_PCI_HC && SPARC_LEON

	default y if SPARC_LEON

	default y





config USB_FHCI_HCD

config USB_FHCI_HCD

	tristate "Freescale QE USB Host Controller support"

	tristate "Freescale QE USB Host Controller support"