diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 10:16:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 10:16:04 +0100 |
| commit | fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5 (patch) | |
| tree | 1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b /drivers | |
| parent | 8954bb0da99b76c7ce5edf2f314807cff68b6ea8 (diff) | |
| parent | cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/z2_battery.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index 9cca465436e..85064a9f649 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" |