summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-06-03 03:44:00 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-06-13 17:55:13 +0200
commit56b925fccc58cd43fc553a8302dbbdd440aef288 (patch)
treee5306441686cf37ac0e7b0fce19e0654c8ce5849
parent[ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h (diff)
downloadlinux-56b925fccc58cd43fc553a8302dbbdd440aef288.tar.xz
linux-56b925fccc58cd43fc553a8302dbbdd440aef288.zip
[ARM] pxa/z2: fix missing include in battery driver
Remove redundant includes and add slab.h to fix problem with building. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r--drivers/power/z2_battery.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index 9cca465436e3..85064a9f649e 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -9,19 +9,13 @@
*
*/
-#include <linux/init.h>
-#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/power_supply.h>
-#include <linux/i2c.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
#include <linux/gpio.h>
+#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <asm/irq.h>
-#include <asm/mach/irq.h>
+#include <linux/power_supply.h>
+#include <linux/slab.h>
#include <linux/z2_battery.h>
#define Z2_DEFAULT_NAME "Z2"