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: 570201 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1HDXNH7017159 for ; Thu, 17 Feb 2011 13:33:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753850Ab1BQNdW (ORCPT ); Thu, 17 Feb 2011 08:33:22 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:34665 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545Ab1BQNdW convert rfc822-to-8bit (ORCPT ); Thu, 17 Feb 2011 08:33:22 -0500 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" , Cc: "Linux-pm mailing list" , Subject: [PATCH] simplify kernel/power/Kconfig Mime-Version: 1.0 Content-Disposition: inline Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.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:33:24 +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