vserver 2.0 rc7

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

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e22a842..cd329dd 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -4,6 +4,31 @@
 
 menu "USB support"
 
+# Host-side USB depends on having a host controller
+# NOTE:  dummy_hcd is always an option, but it's ignored here ...
+# NOTE:  SL-811 option should be board-specific ...
+config USB_ARCH_HAS_HCD
+       boolean
+       default y if USB_ARCH_HAS_OHCI
+       default y if ARM                                # SL-811
+       default PCI
+
+# many non-PCI SOC chips embed OHCI
+config USB_ARCH_HAS_OHCI
+       boolean
+       # ARM:
+       default y if SA1111
+       default y if ARCH_OMAP
+       default y if ARCH_LH7A404
+       default y if PXA27x
+       # PPC:
+       default y if STB03xxx
+       default y if PPC_MPC52xx
+       # MIPS:
+       default y if SOC_AU1X00
+       # more:
+       default PCI
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"
@@ -56,12 +81,15 @@ source "drivers/usb/media/Kconfig"
 
 source "drivers/usb/net/Kconfig"
 
+source "drivers/usb/mon/Kconfig"
+
 comment "USB port drivers"
        depends on USB
 
 config USB_USS720
        tristate "USS720 parport driver"
        depends on USB && PARPORT
+       select PARPORT_NOT_PC
        ---help---
          This driver is for USB parallel port adapters that use the Lucent
          Technologies USS-720 chip. These cables are plugged into your USB