Merge tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[karo-tx-linux.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 56f4336ffa8656a1db10a7a756108e0b567dfd9b..a8a30b1d416761cf004bb760d14125f1a1ffa5b9 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -26,6 +26,11 @@ config USB_XHCI_HCD
 
 if USB_XHCI_HCD
 
+config USB_XHCI_PCI
+       tristate
+       depends on PCI
+       default y
+
 config USB_XHCI_PLATFORM
        tristate
 
@@ -174,6 +179,15 @@ config USB_EHCI_HCD_SPEAR
           Enables support for the on-chip EHCI controller on
           ST SPEAr chips.
 
+config USB_EHCI_HCD_STI
+       tristate "Support for ST STiHxxx on-chip EHCI USB controller"
+       depends on ARCH_STI && OF
+       select GENERIC_PHY
+       select USB_EHCI_HCD_PLATFORM
+       help
+         Enable support for the on-chip EHCI controller found on
+         STMicroelectronics consumer electronics SoC's.
+
 config USB_EHCI_HCD_AT91
         tristate  "Support for Atmel on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && ARCH_AT91
@@ -402,6 +416,15 @@ config USB_OHCI_HCD_SPEAR
           Enables support for the on-chip OHCI controller on
           ST SPEAr chips.
 
+config USB_OHCI_HCD_STI
+       tristate "Support for ST STiHxxx on-chip OHCI USB controller"
+       depends on ARCH_STI && OF
+       select GENERIC_PHY
+       select USB_OHCI_HCD_PLATFORM
+       help
+         Enable support for the on-chip OHCI controller found on
+         STMicroelectronics consumer electronics SoC's.
+
 config USB_OHCI_HCD_S3C2410
         tristate "OHCI support for Samsung S3C24xx/S3C64xx SoC series"
         depends on USB_OHCI_HCD && (ARCH_S3C24XX || ARCH_S3C64XX)
@@ -709,7 +732,7 @@ config USB_WHCI_HCD
 
 config USB_HWA_HCD
        tristate "Host Wire Adapter (HWA) driver"
-       depends on UWB
+       depends on USB && UWB
        select USB_WUSB
        select UWB_HWA
        help