From 941852308008e098b5cf02c652595be6773e02c7 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 21 Nov 2012 17:33:43 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config: Enable POWER_SUPPLY. svn path=/dists/trunk/linux/; revision=19518 --- debian/changelog | 3 +++ debian/config/armhf/config.mx5 | 5 ----- debian/config/config | 3 ++- debian/config/kernelarch-x86/config | 2 -- debian/config/powerpc/config | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a8d5d8a6..7861830b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 21 Nov 2012 09:34:28 +0100 linux (3.6.6-1~experimental.1) experimental; urgency=low diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5 index 0f4271ab5..844c43d50 100644 --- a/debian/config/armhf/config.mx5 +++ b/debian/config/armhf/config.mx5 @@ -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 ## diff --git a/debian/config/config b/debian/config/config index 8d5d2e80f..4965fe29f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -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 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index b970a5b56..f7ee4caa6 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -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 diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index b0793e937..0e16ad4b2 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -691,7 +691,6 @@ CONFIG_TCIC=m ## ## file: drivers/power/Kconfig ## -CONFIG_POWER_SUPPLY=m CONFIG_BATTERY_PMU=m ##