nfsd: track last inode only in use_wgather case

[safe/jmp/linux-2.6] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index f9b1719..c6c816b 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -2,7 +2,15 @@
 # USB device configuration
 #
 
-menu "USB support"
+menuconfig USB_SUPPORT
+       bool "USB support"
+       depends on HAS_IOMEM
+       default y
+       ---help---
+         This option adds core support for Universal Serial Bus (USB).
+         You will also need drivers from the following menu to make use of it.
+
+if USB_SUPPORT
 
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
@@ -11,7 +19,9 @@ config USB_ARCH_HAS_HCD
        boolean
        default y if USB_ARCH_HAS_OHCI
        default y if USB_ARCH_HAS_EHCI
+       default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
+       default y if SUPERH                             # r8a66597-hcd
        default PCI
 
 # many non-PCI SOC chips embed OHCI
@@ -23,14 +33,21 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_LH7A404
        default y if ARCH_S3C2410
        default y if PXA27x
+       default y if PXA3xx
        default y if ARCH_EP93XX
-       default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
-       default y if ARCH_PNX4008
+       default y if ARCH_AT91
+       default y if ARCH_PNX4008 && I2C
+       default y if MFD_TC6393XB
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
        # MIPS:
        default y if SOC_AU1X00
+       # SH:
+       default y if CPU_SUBTYPE_SH7720
+       default y if CPU_SUBTYPE_SH7721
+       default y if CPU_SUBTYPE_SH7763
+       default y if CPU_SUBTYPE_SH7786
        # more:
        default PCI
 
@@ -39,6 +56,7 @@ config USB_ARCH_HAS_EHCI
        boolean
        default y if PPC_83xx
        default y if SOC_AU1200
+       default y if ARCH_IXP4XX
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
@@ -79,20 +97,20 @@ config USB
 
 source "drivers/usb/core/Kconfig"
 
+source "drivers/usb/mon/Kconfig"
+
+source "drivers/usb/wusbcore/Kconfig"
+
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/musb/Kconfig"
+
 source "drivers/usb/class/Kconfig"
 
 source "drivers/usb/storage/Kconfig"
 
-source "drivers/usb/input/Kconfig"
-
 source "drivers/usb/image/Kconfig"
 
-source "drivers/usb/net/Kconfig"
-
-source "drivers/usb/mon/Kconfig"
-
 comment "USB port drivers"
        depends on USB
 
@@ -133,5 +151,6 @@ source "drivers/usb/atm/Kconfig"
 
 source "drivers/usb/gadget/Kconfig"
 
-endmenu
+source "drivers/usb/otg/Kconfig"
 
+endif # USB_SUPPORT