Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

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

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index acac56852b49111af030e6254261c70a723fd57d..1ef6df395e0c83954351fa2dcec9d260a6c97a52 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -4,6 +4,19 @@
 comment "USB Host Controller Drivers"
        depends on USB
 
+config USB_C67X00_HCD
+       tristate "Cypress C67x00 HCD support"
+       depends on USB
+       help
+         The Cypress C67x00 (EZ-Host/EZ-OTG) chips are dual-role
+         host/peripheral/OTG USB controllers.
+
+         Enable this option to support this chip in host controller mode.
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called c67x00.
+
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
        depends on USB && USB_ARCH_HAS_EHCI
@@ -116,7 +129,7 @@ config USB_ISP1760_PCI
 
 config USB_ISP1760_OF
        bool "Support for the OF platform bus"
-       depends on USB_ISP1760_HCD && OF
+       depends on USB_ISP1760_HCD && PPC_OF
        ---help---
          Enables support for the device present on the PowerPC
          OpenFirmware platform bus.