Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 515044129bb98425795978a9ccdd6de189d08374..56f592dc0b3626139f4e9b34dd191af967f30bf0 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -138,7 +138,6 @@ config USB_OHCI_HCD
        tristate "OHCI HCD support"
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
-       select I2C if ARCH_PNX4008
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@ -307,7 +306,8 @@ config SUPERH_ON_CHIP_R8A66597
           SH7366 and SH7723 processors.
 
 config USB_WHCI_HCD
-       tristate "Wireless USB Host Controller Interface (WHCI) driver"
+       tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
        depends on PCI && USB
        select USB_WUSB
        select UWB_WHCI
@@ -319,7 +319,8 @@ config USB_WHCI_HCD
          will be called "whci-hcd".
 
 config USB_HWA_HCD
-        tristate "Host Wire Adapter (HWA) driver"
+       tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
        depends on USB
        select USB_WUSB
        select UWB_HWA