diff options
author | 2010-05-07 11:29:25 +1000 | |
---|---|---|
committer | 2010-05-07 11:29:25 +1000 | |
commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /drivers/w1/masters/omap_hdq.c | |
parent | powerpc/cpumask: Add DEBUG_PER_CPU_MAPS option (diff) | |
parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff) | |
download | linux-dev-1ed31d6db90d51010545921e59d369d2f92b7ac2.tar.xz linux-dev-1ed31d6db90d51010545921e59d369d2f92b7ac2.zip |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/w1/masters/omap_hdq.c')
-rw-r--r-- | drivers/w1/masters/omap_hdq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index ef36fca2eed4..3a7e9ff8a746 100644 --- 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> |