From c36203b790ca1817d08b3b429905b2abc9a656b8 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 10 Jun 2009 11:23:15 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config: Centralize Power
 Management.

svn path=/dists/trunk/linux-2.6/; revision=13766
---
 debian/changelog             | 1 +
 debian/config/amd64/config   | 9 ---------
 debian/config/config         | 9 +++++++++
 debian/config/i386/config    | 9 ---------
 debian/config/ia64/config    | 5 -----
 debian/config/powerpc/config | 9 ---------
 6 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24f95a140..ef9a1f07f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low
   * [s390] Use Sparse Memory layout.
   * [amd64, i386, powerpc, sparc] Make IPv6 support built-in.
   * Centralize sound sound options.
+  * Centralize Power Management options.
 
   [ dann frazier ]
   * Enable bnx2x, using firmware-split patches from net-next and mirroring
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index d74a73d68..e77b8e407 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -1212,15 +1212,6 @@ CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_EFI_PARTITION=y
 
-##
-## file: kernel/power/Kconfig
-##
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-
 ##
 ## file: kernel/trace/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index cdfdc545e..5a37fce08 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2866,6 +2866,15 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 ## end choice
 
+##
+## file: kernel/power/Kconfig
+##
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_SUSPEND=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+
 ##
 ## file: kernel/Kconfig.preempt
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 29ae781c4..bf7ecdd9e 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -1401,15 +1401,6 @@ CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_EFI_PARTITION=y
 
-##
-## file: kernel/power/Kconfig
-##
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-
 ##
 ## file: kernel/trace/Kconfig
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 1e808b359..038348a30 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -839,11 +839,6 @@ CONFIG_EFI_PARTITION=y
 ##
 CONFIG_LOG_BUF_SHIFT=16
 
-##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM_DEBUG is not set
-
 ##
 ## file: mm/Kconfig
 ##
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index c4ea97fc2..dc8f82d30 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -928,15 +928,6 @@ CONFIG_MAC_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 
-##
-## file: kernel/power/Kconfig
-##
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-
 ##
 ## file: net/atm/Kconfig
 ##