diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-11 14:31:11 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-14 19:43:15 -0400 |
commit | 88a6f33e4d7143f94f8e787fa4065ac873507984 (patch) | |
tree | 56b29073b70e9448bb5e89ae63214fbad7a752c4 /kernel | |
parent | aa33860158114d0df3c7997bc1dd41c0168e1c2a (diff) |
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/Kconfig | 7 |
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 | |||
140 | fields of device objects from user space. If you are not a kernel | 140 | fields of device objects from user space. If you are not a kernel |
141 | developer interested in debugging/testing Power Management, say "no". | 141 | developer interested in debugging/testing Power Management, say "no". |
142 | 142 | ||
143 | config PM_SLEEP_ADVANCED_DEBUG | ||
144 | bool | ||
145 | depends on PM_ADVANCED_DEBUG | ||
146 | default n | ||
147 | |||
148 | config PM_TEST_SUSPEND | 143 | config PM_TEST_SUSPEND |
149 | bool "Test suspend/resume and wakealarm during bootup" | 144 | bool "Test suspend/resume and wakealarm during bootup" |
150 | depends on SUSPEND && PM_DEBUG && RTC_CLASS=y | 145 | depends on SUSPEND && PM_DEBUG && RTC_CLASS=y |
@@ -158,7 +153,7 @@ config PM_TEST_SUSPEND | |||
158 | 153 | ||
159 | config CAN_PM_TRACE | 154 | config CAN_PM_TRACE |
160 | def_bool y | 155 | def_bool y |
161 | depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL | 156 | depends on PM_DEBUG && PM_SLEEP |
162 | 157 | ||
163 | config PM_TRACE | 158 | config PM_TRACE |
164 | bool | 159 | bool |