Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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 ed1899d307db0b320b1038f49e66e4edca8946a8..e27b79a3c05f53e8ce1a0117d62d187fa051a030 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -6,19 +6,19 @@ comment "USB Host Controller Drivers"
 
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
-       depends on USB && PCI
+       depends on USB && 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.
          If your USB host controller supports USB 2.0, you will likely want to
-         configure this Host Controller Driver.  At this writing, the primary
-         implementation of EHCI is a chip from NEC, widely available in add-on
-         PCI cards, but implementations are in the works from other vendors
-         including Intel and Philips.  Motherboard support is appearing.
+         configure this Host Controller Driver.  At the time of this writing, 
+         the primary implementation of EHCI is a chip from NEC, widely available
+         in add-on PCI cards, but implementations are in the works from other 
+         vendors including Intel and Philips.  Motherboard support is appearing.
 
          EHCI controllers are packaged with "companion" host controllers (OHCI
          or UHCI) to handle USB 1.1 devices connected to root hub ports.  Ports
-         will connect to EHCI if it the device is high speed, otherwise they
+         will connect to EHCI if the device is high speed, otherwise they
          connect to a companion controller.  If you configure EHCI, you should
          probably configure the OHCI (for NEC and some other vendors) USB Host
          Controller Driver or UHCI (for Via motherboards) Host Controller