summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-09-24 11:41:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-24 11:05:01 -0700
commit2dab3948f5eeffa320ad92207ef77c997518867b (patch)
tree742df438624b76689a670b95afab1a6a38a40c61 /drivers
parenta666e3e6098a9f56310e4ec2705f1dad124a34b5 (diff)
downloadlinux-3.10-2dab3948f5eeffa320ad92207ef77c997518867b.tar.gz
linux-3.10-2dab3948f5eeffa320ad92207ef77c997518867b.tar.bz2
linux-3.10-2dab3948f5eeffa320ad92207ef77c997518867b.zip
USB: update Kconfig help text for CONFIG_USB_SUSPEND
This patch (as1429) updates the Kconfig help text for CONFIG_USB_SUSPEND. The power/level file is now deprecated; we should tell people to use power/control instead. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 7e594449600..9eed5b52d9d 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -91,12 +91,12 @@ config USB_DYNAMIC_MINORS
If you are unsure about this, say N here.
config USB_SUSPEND
- bool "USB runtime power management (suspend/resume and wakeup)"
+ bool "USB runtime power management (autosuspend) and wakeup"
depends on USB && PM_RUNTIME
help
If you say Y here, you can use driver calls or the sysfs
- "power/level" file to suspend or resume individual USB
- peripherals and to enable or disable autosuspend (see
+ "power/control" file to enable or disable autosuspend for
+ individual USB peripherals (see
Documentation/usb/power-management.txt for more details).
Also, USB "remote wakeup" signaling is supported, whereby some