* debian/changelog: Update.

* debian/config: Enable POWER_SUPPLY.

svn path=/dists/trunk/linux/; revision=19518
This commit is contained in:
Bastian Blank 2012-11-21 17:33:43 +00:00
parent 63c4077890
commit 9418523080
5 changed files with 5 additions and 9 deletions

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
* New upstream stable update:
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.7
[ Bastian Blank ]
* Enable POWER_SUPPLY.
-- Bastian Blank <waldi@debian.org> Wed, 21 Nov 2012 09:34:28 +0100
linux (3.6.6-1~experimental.1) experimental; urgency=low

View File

@ -96,11 +96,6 @@ CONFIG_MTD=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
##
## file: drivers/power/Kconfig
##
CONFIG_POWER_SUPPLY=y
##
## file: drivers/regulator/Kconfig
##

View File

@ -2462,7 +2462,8 @@ CONFIG_SONY_LAPTOP=m
##
## file: drivers/power/Kconfig
##
# CONFIG_POWER_SUPPLY is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_WM831X_POWER=m
CONFIG_WM8350_POWER=m
# CONFIG_TEST_POWER is not set

View File

@ -1134,8 +1134,6 @@ CONFIG_PNP=y
##
## file: drivers/power/Kconfig
##
CONFIG_POWER_SUPPLY=m
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_BATTERY_DS2760=m
CONFIG_BATTERY_SBS=m

View File

@ -691,7 +691,6 @@ CONFIG_TCIC=m
##
## file: drivers/power/Kconfig
##
CONFIG_POWER_SUPPLY=m
CONFIG_BATTERY_PMU=m
##