aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorJonas Linde <jonas.linde@stericsson.com>2010-03-23 08:46:37 +0100
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:44:27 -0600
commitbd48618526e5d4d804682a0109a050cbbac326e6 (patch)
treefbe24bad55267417617571f8693044f3e39e28e7 /arch/arm/configs
parentd931feac0c3a28ee889d01d6e6883845b6f34316 (diff)
Fix for 255996 enable battery management by default
Signed-off-by: Jonas Linde <jonas.linde@stericsson.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mop500_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/mop500_defconfig b/arch/arm/configs/mop500_defconfig
index 2d3b4e8d519..d10e08b951a 100644
--- a/arch/arm/configs/mop500_defconfig
+++ b/arch/arm/configs/mop500_defconfig
@@ -582,7 +582,7 @@ CONFIG_ANDROID_PMEM=y
# CONFIG_APANIC is not set
CONFIG_APANIC_PLABEL="kpanic"
CONFIG_AB8500=y
-# CONFIG_AB8500_GPADC is not set
+CONFIG_AB8500_GPADC=y
# CONFIG_C2PORT is not set
#
@@ -875,7 +875,7 @@ CONFIG_GPIO_STMPE1601=y
# CONFIG_PDA_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_AB8500_BM is not set
+CONFIG_AB8500_BM=y
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
CONFIG_THERMAL_HWMON=y