summaryrefslogtreecommitdiff
path: root/arch/arm/configs/u8500_defconfig
diff options
context:
space:
mode:
authorKalle Komierowski <karl.komierowski@stericsson.com>2011-09-15 11:30:19 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:12:38 +0200
commitc0f00a50eaa67d7c0ed5e5b06a05f5e5f2934822 (patch)
tree9280393b5a7512dd6ae2a2e3d60843f5bf8f8bfe /arch/arm/configs/u8500_defconfig
parent770b99982c652682e1b173a09ac08cb162806073 (diff)
ARM: configs: U8500 Disable BATCTRL ADC temperature measurements
This is to be coherent with the kernel 2.3 configuration. ST-Ericsson ID: NA ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Kalle Komierowski <karl.komierowski@stericsson.com> Change-Id: Ia87696d62b6bf0de05017c9c260cc5b313393811 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31036 Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Diffstat (limited to 'arch/arm/configs/u8500_defconfig')
-rwxr-xr-xarch/arm/configs/u8500_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 29364c8a5a0..129be9dfb88 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -195,7 +195,7 @@ CONFIG_GPIO_TC3589X=y
CONFIG_GPIO_AB8500=y
CONFIG_POWER_SUPPLY=y
CONFIG_AB8500_BM=y
-CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
+CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=n
CONFIG_AB5500_BM=y
CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y
CONFIG_SENSORS_AB8500=y