Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-block.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 54c1215807380710c6b112224ea4e7a43362c3f4..4263d011392c08f752e8c00cf49e64da770115e4 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -17,7 +17,6 @@ config USB_C67X00_HCD
 
 config USB_XHCI_HCD
        tristate "xHCI HCD (USB 3.0) support"
-       depends on USB_ARCH_HAS_XHCI
        ---help---
          The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
          "SuperSpeed" host controller hardware.
@@ -43,7 +42,6 @@ endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
-       depends on USB_ARCH_HAS_EHCI
        ---help---
          The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
          "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -200,7 +198,7 @@ config USB_EHCI_MSM
          has an external PHY.
 
 config USB_EHCI_TEGRA
-       boolean "NVIDIA Tegra HCD support"
+       tristate "NVIDIA Tegra HCD support"
        depends on ARCH_TEGRA
        select USB_EHCI_ROOT_HUB_TT
        select USB_PHY
@@ -225,7 +223,7 @@ config USB_EHCI_SH
 
 config USB_EHCI_S5P
        tristate "EHCI support for Samsung S5P/EXYNOS SoC Series"
-       depends on PLAT_S5P
+       depends on PLAT_S5P || ARCH_EXYNOS
        help
        Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's
        on-chip EHCI controller.
@@ -345,9 +343,19 @@ config USB_ISP1362_HCD
          To compile this driver as a module, choose M here: the
          module will be called isp1362-hcd.
 
+config USB_FUSBH200_HCD
+       tristate "FUSBH200 HCD support"
+       depends on USB
+       default N
+       ---help---
+       Faraday FUSBH200 is designed to meet USB2.0 EHCI specification
+       with minor modification.
+
+       To compile this driver as a module, choose M here: the
+       module will be called fusbh200-hcd.
+
 config USB_OHCI_HCD
-       tristate "OHCI HCD support"
-       depends on USB_ARCH_HAS_OHCI
+       tristate "OHCI HCD (USB 1.1) support"
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
        depends on USB_ISP1301 || !ARCH_LPC32XX
        ---help---
@@ -415,8 +423,8 @@ config USB_OHCI_HCD_PPC_OF
        default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
 
 config USB_OHCI_HCD_PCI
-       bool "OHCI support for PCI-bus USB controllers"
-       depends on PCI && (STB03xxx || PPC_MPC52xx || USB_OHCI_HCD_PPC_OF)
+       tristate "OHCI support for PCI-bus USB controllers"
+       depends on PCI
        default y
        select USB_OHCI_LITTLE_ENDIAN
        ---help---
@@ -470,7 +478,7 @@ config USB_CNS3XXX_OHCI
          It is needed for low-speed USB 1.0 device support.
 
 config USB_OHCI_HCD_PLATFORM
-       bool "Generic OHCI driver for a platform device"
+       tristate "Generic OHCI driver for a platform device"
        default n
        ---help---
          Adds an OHCI host driver for a generic platform device, which