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 'omap4-i2c-init' into omap-for-linus
[pandora-kernel.git]
/
drivers
/
mfd
/
mfd-core.c
diff --git
a/drivers/mfd/mfd-core.c
b/drivers/mfd/mfd-core.c
index
aa17f4b
..
8ffbb7a
100644
(file)
--- a/
drivers/mfd/mfd-core.c
+++ b/
drivers/mfd/mfd-core.c
@@
-15,6
+15,7
@@
#include <linux/platform_device.h>
#include <linux/acpi.h>
#include <linux/mfd/core.h>
+#include <linux/slab.h>
static int mfd_add_device(struct device *parent, int id,
const struct mfd_cell *cell,