From 0f2006b5496b6ed977040f9a019e1e4d915e3074 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 11 Feb 2011 20:31:11 +0100 Subject: [PATCH] --- yaml --- r: 235147 b: refs/heads/master c: 88a6f33e4d7143f94f8e787fa4065ac873507984 h: refs/heads/master i: 235145: eec1bff474d17d497c238dad0056f90f8a09d4f3 235143: e27f889e5a78f17f3cca6c7eef2e0a353d3b4ead v: v3 --- [refs] | 2 +- trunk/kernel/power/Kconfig | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 979c4fafcd1a..a4b6471e6f79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa33860158114d0df3c7997bc1dd41c0168e1c2a +refs/heads/master: 88a6f33e4d7143f94f8e787fa4065ac873507984 diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index 0710beead05b..298bed04555e 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/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