diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-19 11:25:00 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:50:46 +0100 |
| commit | 4fca79cc380130f325e1f3ad24e8bb4b0b82430d (patch) | |
| tree | f44c8958c76ab28628e3f541d401c3ad2e26bd0d | |
| parent | fc9ce3306118aa6fc99eca3191f4e28c5b597080 (diff) | |
ux500: Fix CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL configuration
Remove the temporary AB8500_BATTERY_THERM_ON_BATCTRL flag and use
CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL instead
ST-Ericsson Linux next: -
ST-Ericsson Change-ID: ER330310
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ib4328deaa4fafe887f9082fc8a1e8e0c618e0d61
Signed-off-by: Mikael HEDEN <mikael.xx.heden@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19014
Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com>
Reviewed-by: Johan GARDSMARK <johan.gardsmark@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Conflicts:
arch/arm/mach-ux500/Makefile
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-bm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-bm.c b/arch/arm/mach-ux500/board-mop500-bm.c index 031d8721f4a..945964f3300 100644 --- a/arch/arm/mach-ux500/board-mop500-bm.c +++ b/arch/arm/mach-ux500/board-mop500-bm.c @@ -14,7 +14,7 @@ #include <linux/mfd/ab8500/bm.h> #include "board-mop500-bm.h" -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL /* * These are the defined batteries that uses a NTC and ID resistor placed * inside of the battery pack. @@ -176,7 +176,7 @@ static const struct battery_type bat_type[] = { .v_to_cap_tbl = cap_tbl, }, -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL { .name = POWER_SUPPLY_TECHNOLOGY_LIPO, .resis_high = 53407, @@ -390,7 +390,7 @@ struct ab8500_bm_data ab8500_bm_data = { .usb_safety_tmr_h = 4, .bkup_bat_v = BUP_VCH_SEL_2P6V, .bkup_bat_i = BUP_ICH_SEL_150UA, -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL .adc_therm = ADC_THERM_BATCTRL, #else .adc_therm = ADC_THERM_BATTEMP, |