---

yaml --- r: 235147 b: refs/heads/master c: 88a6f33 h: refs/heads/master i: 235145: eec1bff 235143: e27f889 v: v3
git-mirror · Mar 14, 2011 · 0f2006b · 0f2006b
1 parent 04f4dff
commit 0f2006b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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