From d2f6011c8be1fcf9c5f724f4b753e6a813a1b103 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 24 Sep 2010 11:41:46 -0400 Subject: [PATCH] --- yaml --- r: 210965 b: refs/heads/master c: 2dab3948f5eeffa320ad92207ef77c997518867b h: refs/heads/master i: 210963: 8177b9d742bb11097befdc677e844b4c58a422f4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52154b9bfe3c..7a9ee809a7bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a666e3e6098a9f56310e4ec2705f1dad124a34b5 +refs/heads/master: 2dab3948f5eeffa320ad92207ef77c997518867b diff --git a/trunk/drivers/usb/core/Kconfig b/trunk/drivers/usb/core/Kconfig index 7e594449600e..9eed5b52d9de 100644 --- a/trunk/drivers/usb/core/Kconfig +++ b/trunk/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