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 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
power
/
wm831x_power.c
diff --git
a/drivers/power/wm831x_power.c
b/drivers/power/wm831x_power.c
index
f85e80b
..
875c4d0
100644
(file)
--- a/
drivers/power/wm831x_power.c
+++ b/
drivers/power/wm831x_power.c
@@
-12,6
+12,7
@@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
+#include <linux/slab.h>
#include <linux/mfd/wm831x/core.h>
#include <linux/mfd/wm831x/auxadc.h>