Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 1a9ff61..a08787e 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -61,14 +61,17 @@ config USB_DYNAMIC_MINORS
          If you are unsure about this, say N here.
 
 config USB_SUSPEND
-       bool "USB suspend/resume (EXPERIMENTAL)"
+       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.  There are many related features, such as
-         remote wakeup and driver-specific suspend processing, that
-         may not yet work as expected.
+         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.
 
@@ -96,4 +99,11 @@ config USB_OTG_WHITELIST
          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.