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
/
w1-gpio.c
diff --git
a/drivers/w1/masters/w1-gpio.c
b/drivers/w1/masters/w1-gpio.c
index
6f8866d
..
fcbe742
100644
(file)
--- a/
drivers/w1/masters/w1-gpio.c
+++ b/
drivers/w1/masters/w1-gpio.c
@@
-11,6
+11,7
@@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/slab.h>
#include <linux/w1-gpio.h>
#include "../w1.h"