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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
w1
/
masters
/
omap_hdq.c
diff --git
a/drivers/w1/masters/omap_hdq.c
b/drivers/w1/masters/omap_hdq.c
index
ef36fca
..
3a7e9ff
100644
(file)
--- a/
drivers/w1/masters/omap_hdq.c
+++ b/
drivers/w1/masters/omap_hdq.c
@@
-16,6
+16,7
@@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>
+#include <linux/sched.h>
#include <asm/irq.h>
#include <mach/hardware.h>