diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:41:39 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:41:39 +0100 |
commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/video/amba-clcd.c | |
parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
parent | Linux 2.6.29-rc1 (diff) | |
download | linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/video/amba-clcd.c')
-rw-r--r-- | drivers/video/amba-clcd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 2ac52fd8cc11..4e046fed1380 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c @@ -24,6 +24,7 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/clk.h> +#include <linux/hardirq.h> #include <asm/sizes.h> |