* debian/changelog: Update.

* debian/config: Centralize Power Management.

svn path=/dists/trunk/linux-2.6/; revision=13766
This commit is contained in:
Bastian Blank 2009-06-10 11:23:15 +00:00
parent b6a7f6750a
commit c36203b790
6 changed files with 10 additions and 32 deletions

1
debian/changelog vendored
View File

@ -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

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##