fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 85dacc9..9980a4d 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -10,6 +10,7 @@ menu "USB support"
 config USB_ARCH_HAS_HCD
        boolean
        default y if USB_ARCH_HAS_OHCI
+       default y if USB_ARCH_HAS_EHCI
        default y if ARM                                # SL-811
        default PCI
 
@@ -22,6 +23,9 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_LH7A404
        default y if ARCH_S3C2410
        default y if PXA27x
+       default y if ARCH_EP93XX
+       default y if ARCH_AT91
+       default y if ARCH_PNX4008
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@ -30,6 +34,13 @@ config USB_ARCH_HAS_OHCI
        # more:
        default PCI
 
+# some non-PCI hcds implement EHCI
+config USB_ARCH_HAS_EHCI
+       boolean
+       default y if PPC_83xx
+       default y if SOC_AU1200
+       default PCI
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"
@@ -78,8 +89,6 @@ source "drivers/usb/input/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
-source "drivers/usb/media/Kconfig"
-
 source "drivers/usb/net/Kconfig"
 
 source "drivers/usb/mon/Kconfig"