From a294673dd9094dcad8dcb4ef04099d5d671332ac Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@linaro.org>
Date: Mon, 27 Jun 2011 11:35:42 +0200
Subject: power: u5500: Fix and activate Battery Management for U5500

Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
---
 arch/arm/configs/u8500_defconfig     | 3 +++
 arch/arm/mach-ux500/board-u5500-bm.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'arch')

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index e095688d4bf..07c8f198f79 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -157,6 +157,9 @@ CONFIG_GPIO_TC3589X=y
 CONFIG_AB8500_GPIO=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_AB8500_BM=y
+CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
+CONFIG_AB5500_BM=y
+CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y
 CONFIG_SENSORS_AB8500=y
 CONFIG_SENSORS_DB8500=y
 CONFIG_SENSORS_LSM303DLH=y
diff --git a/arch/arm/mach-ux500/board-u5500-bm.c b/arch/arm/mach-ux500/board-u5500-bm.c
index 2616d7fa517..7cfc6386b35 100644
--- a/arch/arm/mach-ux500/board-u5500-bm.c
+++ b/arch/arm/mach-ux500/board-u5500-bm.c
@@ -13,7 +13,6 @@
 
 #include <linux/power_supply.h>
 #include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
 #include <linux/mfd/abx500/ab5500-bm.h>
 #include "board-u5500-bm.h"
 
-- 
cgit v1.2.3