diff options
author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
tree | c947fdc158e144c2d060486b65d10ee67d254039 /kernel/irq_work.c | |
parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
Diffstat (limited to 'kernel/irq_work.c')
-rw-r--r-- | kernel/irq_work.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 0c56d44b9fd..1588e3b2871 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -11,6 +11,7 @@ #include <linux/irq_work.h> #include <linux/percpu.h> #include <linux/hardirq.h> +#include <linux/irqflags.h> #include <asm/processor.h> /* |