From fe2eefaac2b2290d6733203aaa9c9c95a5c312e1 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Thu, 3 Jun 2010 03:44:00 +0200
Subject: [PATCH] --- yaml --- r: 200798 b: refs/heads/master c:
 56b925fccc58cd43fc553a8302dbbdd440aef288 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/power/z2_battery.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index be46c71b2444..cf62b118fae4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 390daa0d8f391378865221cd8446028884a3baa9
+refs/heads/master: 56b925fccc58cd43fc553a8302dbbdd440aef288
diff --git a/trunk/drivers/power/z2_battery.c b/trunk/drivers/power/z2_battery.c
index 9cca465436e3..85064a9f649e 100644
--- a/trunk/drivers/power/z2_battery.c
+++ b/trunk/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"