projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[cascardo/linux.git]
/
drivers
/
mfd
/
mcp-core.c
diff --git
a/drivers/mfd/mcp-core.c
b/drivers/mfd/mcp-core.c
index
c75d713
..
55ba230
100644
(file)
--- a/
drivers/mfd/mcp-core.c
+++ b/
drivers/mfd/mcp-core.c
@@
-15,6
+15,8
@@
#include <linux/errno.h>
#include <linux/smp.h>
#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
#include <asm/dma.h>
#include <asm/system.h>