summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-11 20:31:11 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-15 00:43:15 +0100
commit88a6f33e4d7143f94f8e787fa4065ac873507984 (patch)
tree56b29073b70e9448bb5e89ae63214fbad7a752c4 /kernel
parentaa33860158114d0df3c7997bc1dd41c0168e1c2a (diff)
downloadlinux-stable-88a6f33e4d7143f94f8e787fa4065ac873507984.tar.gz
linux-stable-88a6f33e4d7143f94f8e787fa4065ac873507984.tar.bz2
linux-stable-88a6f33e4d7143f94f8e787fa4065ac873507984.zip
PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option
CONFIG_PM_SLEEP_ADVANCED_DEBUG is not used any more, so drop it and CONFIG_CAN_PM_TRACE need not depend on EXPERIMENTAL, so remove that dependency. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 0710beead05b..298bed04555e 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -140,11 +140,6 @@ config PM_ADVANCED_DEBUG
fields of device objects from user space. If you are not a kernel
developer interested in debugging/testing Power Management, say "no".
-config PM_SLEEP_ADVANCED_DEBUG
- bool
- depends on PM_ADVANCED_DEBUG
- default n
-
config PM_TEST_SUSPEND
bool "Test suspend/resume and wakealarm during bootup"
depends on SUSPEND && PM_DEBUG && RTC_CLASS=y
@@ -158,7 +153,7 @@ config PM_TEST_SUSPEND
config CAN_PM_TRACE
def_bool y
- depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL
+ depends on PM_DEBUG && PM_SLEEP
config PM_TRACE
bool