diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /drivers/power/wm97xx_battery.c | |
| parent | ARM: 6131/1: MAINTAINERS: update for ARM/Gemini (diff) | |
| parent | ARM: 6283/1: Remove useless PCIO_BASE definitions (diff) | |
| download | linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.tar.xz linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.zip | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'drivers/power/wm97xx_battery.c')
| -rw-r--r-- | drivers/power/wm97xx_battery.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 23eed356a854..4e8afce0c818 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -23,6 +23,7 @@ #include <linux/interrupt.h> #include <linux/gpio.h> #include <linux/irq.h> +#include <linux/slab.h> static DEFINE_MUTEX(bat_lock); static struct work_struct bat_work; @@ -307,6 +308,9 @@ static void __exit wm97xx_bat_exit(void) platform_driver_unregister(&wm97xx_bat_driver); } +/* The interface is deprecated, as well as linux/wm97xx_batt.h */ +void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data); + void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) { gpdata = data; |