fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 050b078..3e66b2a 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -31,9 +31,6 @@ config USB_DEVICEFS
          For the format of the various /proc/bus/usb/ files, please read
          <file:Documentation/usb/proc_usb_info.txt>.
 
-         Please note that this code is completely unrelated to devfs, the
-         "/dev file system support".
-
          Most users want to say Y here.
 
 config USB_BANDWIDTH
@@ -60,3 +57,49 @@ config USB_DYNAMIC_MINORS
 
          If you are unsure about this, say N here.
 
+config USB_SUSPEND
+       bool "USB selective suspend/resume and wakeup (EXPERIMENTAL)"
+       depends on USB && PM && EXPERIMENTAL
+       help
+         If you say Y here, you can use driver calls or the sysfs
+         "power/state" file to suspend or resume individual USB
+         peripherals.
+
+         Also, USB "remote wakeup" signaling is supported, whereby some
+         USB devices (like keyboards and network adapters) can wake up
+         their parent hub.  That wakeup cascades up the USB tree, and
+         could wake the system from states like suspend-to-RAM.
+
+         If you are unsure about this, say N here.
+
+config USB_OTG
+       bool
+       depends on USB && EXPERIMENTAL
+       select USB_SUSPEND
+       default n
+
+
+config USB_OTG_WHITELIST
+       bool "Rely on OTG Targeted Peripherals List"
+       depends on USB_OTG
+       default y
+       help
+         If you say Y here, the "otg_whitelist.h" file will be used as a
+         product whitelist, so USB peripherals not listed there will be
+         rejected during enumeration.  This behavior is required by the
+         USB OTG specification for all devices not on your product's
+         "Targeted Peripherals List".
+
+         Otherwise, peripherals not listed there will only generate a
+         warning and enumeration will continue.  That's more like what
+         normal Linux-USB hosts do (other than the warning), and is
+         convenient for many stages of product development.
+
+config USB_OTG_BLACKLIST_HUB
+       bool "Disable external hubs"
+       depends on USB_OTG
+       help
+         If you say Y here, then Linux will refuse to enumerate
+         external hubs.  OTG hosts are allowed to reduce hardware
+         and software costs by not supporting external hubs.
+