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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
drivers
/
w1
/
masters
/
ds1wm.c
diff --git
a/drivers/w1/masters/ds1wm.c
b/drivers/w1/masters/ds1wm.c
index
37f08c8
..
6b85e7f
100644
(file)
--- a/
drivers/w1/masters/ds1wm.c
+++ b/
drivers/w1/masters/ds1wm.c
@@
-20,6
+20,7
@@
#include <linux/delay.h>
#include <linux/mfd/core.h>
#include <linux/mfd/ds1wm.h>
+#include <linux/slab.h>
#include <asm/io.h>