git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
power
/
pmu_battery.c
diff --git
a/drivers/power/pmu_battery.c
b/drivers/power/pmu_battery.c
index
9c87ad5
..
023d249
100644
(file)
--- a/
drivers/power/pmu_battery.c
+++ b/
drivers/power/pmu_battery.c
@@
-14,6
+14,7
@@
#include <linux/power_supply.h>
#include <linux/adb.h>
#include <linux/pmu.h>
+#include <linux/slab.h>
static struct pmu_battery_dev {
struct power_supply bat;