From 4024e75c5df97208de7f79d581dab98d07e00725 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 17 May 2011 23:25:10 +0200
Subject: [PATCH] --- yaml --- r: 245373 b: refs/heads/master c:
 c650da23d59d2c82307380414606774c6d49b8bd h: refs/heads/master i:   245371:
 d1e21c35a8bb1d7217b69a7557050f98c9d24618 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/sh/configs/apsh4ad0a_defconfig | 1 -
 trunk/arch/sh/configs/sdk7786_defconfig   | 1 -
 trunk/drivers/base/power/Makefile         | 3 +--
 trunk/kernel/power/Kconfig                | 6 ------
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 701731a7bcca..fb1c15a1a026 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 290c748725c170ed9a02522959ae67f528eefe98
+refs/heads/master: c650da23d59d2c82307380414606774c6d49b8bd
diff --git a/trunk/arch/sh/configs/apsh4ad0a_defconfig b/trunk/arch/sh/configs/apsh4ad0a_defconfig
index e71a531f1e31..77ec0e7b8ddf 100644
--- a/trunk/arch/sh/configs/apsh4ad0a_defconfig
+++ b/trunk/arch/sh/configs/apsh4ad0a_defconfig
@@ -48,7 +48,6 @@ CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
 CONFIG_PM_RUNTIME=y
 CONFIG_CPU_IDLE=y
 CONFIG_NET=y
diff --git a/trunk/arch/sh/configs/sdk7786_defconfig b/trunk/arch/sh/configs/sdk7786_defconfig
index dc4a2eb6a616..c41650572d79 100644
--- a/trunk/arch/sh/configs/sdk7786_defconfig
+++ b/trunk/arch/sh/configs/sdk7786_defconfig
@@ -83,7 +83,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
 CONFIG_PM_RUNTIME=y
 CONFIG_CPU_IDLE=y
 CONFIG_NET=y
diff --git a/trunk/drivers/base/power/Makefile b/trunk/drivers/base/power/Makefile
index 06a7073f9027..3647e114d0e7 100644
--- a/trunk/drivers/base/power/Makefile
+++ b/trunk/drivers/base/power/Makefile
@@ -5,5 +5,4 @@ obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o
 obj-$(CONFIG_PM_OPP)	+= opp.o
 obj-$(CONFIG_HAVE_CLK)	+= clock_ops.o
 
-ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
-ccflags-$(CONFIG_PM_VERBOSE)   += -DDEBUG
+ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
\ No newline at end of file
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index d74ad4a90695..87f4d24b55b0 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -125,12 +125,6 @@ config PM_DEBUG
 	code. This is helpful when debugging and reporting PM bugs, like
 	suspend support.
 
-config PM_VERBOSE
-	bool "Verbose Power Management debugging"
-	depends on PM_DEBUG
-	---help---
-	This option enables verbose messages from the Power Management code.
-
 config PM_ADVANCED_DEBUG
 	bool "Extra PM attributes in sysfs for low-level debugging/testing"
 	depends on PM_DEBUG