diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 05:16:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 05:16:04 -0400 |
| 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 9cca465436e3..85064a9f649e 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c | |||
| @@ -9,19 +9,13 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 15 | #include <linux/platform_device.h> | ||
| 16 | #include <linux/power_supply.h> | ||
| 17 | #include <linux/i2c.h> | ||
| 18 | #include <linux/spinlock.h> | ||
| 19 | #include <linux/interrupt.h> | ||
| 20 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
| 14 | #include <linux/i2c.h> | ||
| 21 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 22 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
| 23 | #include <asm/irq.h> | 17 | #include <linux/power_supply.h> |
| 24 | #include <asm/mach/irq.h> | 18 | #include <linux/slab.h> |
| 25 | #include <linux/z2_battery.h> | 19 | #include <linux/z2_battery.h> |
| 26 | 20 | ||
| 27 | #define Z2_DEFAULT_NAME "Z2" | 21 | #define Z2_DEFAULT_NAME "Z2" |