diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-27 11:35:42 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:48 +0200 |
| commit | 43e94eb702b3e3b77742302232a5362245ffe53f (patch) | |
| tree | 48cb5cd2c7145e24514424a9d84864ff1dd3e965 /drivers | |
| parent | 48d356998f1c94bde4b7259102b663a54c95450a (diff) | |
power: u5500: Fix and activate Battery Management for U5500
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/power/ab5500_btemp.c | 1 | ||||
| -rw-r--r-- | drivers/power/ab5500_charger.c | 1 | ||||
| -rw-r--r-- | drivers/power/ab5500_fg.c | 1 | ||||
| -rw-r--r-- | drivers/power/abx500_chargalg.c | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index a3adadd21ba..a4fcd78c6d6 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -250,7 +250,7 @@ config AB8500_BATTERY_THERM_ON_BATCTRL config AB5500_BM bool "AB5500 Battery Management Driver" - depends on AB5500_CORE && MACH_B5500 + depends on AB5500_CORE && AB8500_GPADC && ARCH_U8500 help Say Y to include support for AB5500 battery management. diff --git a/drivers/power/ab5500_btemp.c b/drivers/power/ab5500_btemp.c index 57241c96f60..8b6ff82a86b 100644 --- a/drivers/power/ab5500_btemp.c +++ b/drivers/power/ab5500_btemp.c @@ -20,7 +20,6 @@ #include <linux/completion.h> #include <linux/workqueue.h> #include <linux/mfd/abx500.h> -#include <linux/mfd/abx500/ab5500.h> #include <linux/mfd/abx500/ab5500-bm.h> #include <linux/mfd/abx500/ab5500-gpadc.h> diff --git a/drivers/power/ab5500_charger.c b/drivers/power/ab5500_charger.c index 1b6bfa21d00..2fd7888ad9d 100644 --- a/drivers/power/ab5500_charger.c +++ b/drivers/power/ab5500_charger.c @@ -23,7 +23,6 @@ #include <linux/workqueue.h> #include <linux/kobject.h> #include <linux/mfd/abx500.h> -#include <linux/mfd/abx500/ab5500.h> #include <linux/mfd/abx500/ab5500-bm.h> #include <linux/mfd/abx500/ab5500-gpadc.h> #include <linux/mfd/abx500/ux500_chargalg.h> diff --git a/drivers/power/ab5500_fg.c b/drivers/power/ab5500_fg.c index 1c866e8fec5..919af5faadf 100644 --- a/drivers/power/ab5500_fg.c +++ b/drivers/power/ab5500_fg.c @@ -25,7 +25,6 @@ #include <linux/delay.h> #include <linux/mfd/abx500/ab5500-gpadc.h> #include <linux/mfd/abx500/ab5500-bm.h> -#include <linux/mfd/abx500/ab5500.h> #include <linux/mfd/abx500.h> static LIST_HEAD(ab5500_fg_list); diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index c85e284e04a..bb0fa42b109 100644 --- a/drivers/power/abx500_chargalg.c +++ b/drivers/power/abx500_chargalg.c @@ -21,7 +21,6 @@ #include <linux/workqueue.h> #include <linux/kobject.h> #include <linux/mfd/abx500.h> -#include <linux/mfd/abx500/ab5500.h> #include <linux/mfd/abx500/ux500_chargalg.h> #include <linux/mfd/abx500/ab5500-bm.h> |