From patchwork Thu Feb 17 13:34:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 570231 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1HDatGe019037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 17 Feb 2011 13:37:20 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1HDXqBD004671; Thu, 17 Feb 2011 05:34:22 -0800 Received: from vpn.id2.novell.com (vpn.id2.novell.com [195.33.99.129]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1HDXLqZ004616 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 17 Feb 2011 05:33:23 -0800 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Thu, 17 Feb 2011 13:33:20 +0000 Message-Id: <4D5D31E3020000780003263F@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Thu, 17 Feb 2011 13:34:11 +0000 From: "Jan Beulich" To: "Rafael J. Wysocki" , Mime-Version: 1.0 Content-Disposition: inline Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-106.523 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, PATCH_SUBJECT_OSDL, USER_IN_WHITELIST X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: Linux-pm mailing list , linux-kbuild@vger.kernel.org Subject: [linux-pm] [PATCH] simplify kernel/power/Kconfig X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Feb 2011 13:37:20 +0000 (UTC) --- 2.6.38-rc5/kernel/power/Kconfig +++ 2.6.38-rc5-kconfig-power/kernel/power/Kconfig @@ -30,7 +30,6 @@ config PM_DEBUG config PM_ADVANCED_DEBUG bool "Extra PM attributes in sysfs for low-level debugging/testing" depends on PM_DEBUG - default n ---help--- Add extra sysfs attributes allowing one to access some Power Management fields of device objects from user space. If you are not a kernel @@ -39,7 +38,6 @@ config PM_ADVANCED_DEBUG config PM_VERBOSE bool "Verbose Power Management debugging" depends on PM_DEBUG - default n ---help--- This option enables verbose messages from the Power Management code. @@ -67,7 +65,6 @@ config PM_TRACE_RTC depends on CAN_PM_TRACE depends on X86 select PM_TRACE - default n ---help--- This enables some cheesy code to save the last PM event point in the RTC across reboots, so that you can debug a machine that just hangs @@ -82,23 +79,20 @@ config PM_TRACE_RTC set to an invalid time after a resume. config PM_SLEEP_SMP - bool + def_bool y depends on SMP depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE depends on PM_SLEEP select HOTPLUG select HOTPLUG_CPU - default y config PM_SLEEP - bool + def_bool y depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE - default y config PM_SLEEP_ADVANCED_DEBUG bool depends on PM_ADVANCED_DEBUG - default n config SUSPEND bool "Suspend to RAM and standby" @@ -237,9 +231,8 @@ config PM_RUNTIME wake-up events. config PM_OPS - bool + def_bool y depends on PM_SLEEP || PM_RUNTIME - default y config ARCH_HAS_OPP bool