[kernel] r13766 - in dists/trunk/linux-2.6/debian: . config config/amd64 config/i386 config/ia64 config/powerpc

[Bastian Blank]

Author: waldi
Date: Wed Jun 10 11:23:15 2009
New Revision: 13766

Log:
* debian/changelog: Update.
* debian/config: Centralize Power Management.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jun 10 11:23:15 2009	(r13766)
@@ -65,6 +65,7 @@
   * [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

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 11:23:15 2009	(r13766)
@@ -1213,15 +1213,6 @@
 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
 ##
 # CONFIG_MMIOTRACE is not set

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 11:23:15 2009	(r13766)
@@ -2867,6 +2867,15 @@
 ## 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
 ##
 ## choice: Preemption Model

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 11:23:15 2009	(r13766)
@@ -1402,15 +1402,6 @@
 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
 ##
 # CONFIG_MMIOTRACE is not set

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed Jun 10 11:23:15 2009	(r13766)
@@ -840,11 +840,6 @@
 CONFIG_LOG_BUF_SHIFT=16
 
 ##
-## file: kernel/power/Kconfig
-##
-# CONFIG_PM_DEBUG is not set
-
-##
 ## file: mm/Kconfig
 ##
 CONFIG_MIGRATION=y

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Jun 10 11:17:20 2009	(r13765)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Jun 10 11:23:15 2009	(r13766)
@@ -929,15 +929,6 @@
 # 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
 ##
 CONFIG_ATM=m