diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 02:24:22 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 02:24:22 (GMT) |
commit | acf1cf6a1c0966ef64a73083ca985605a12b032d (patch) | |
tree | 710902446708686aa67ea9888b366258512c92b3 /arch/mips/fw/arc/misc.c | |
parent | 295c799ae45b3678d9b8d3e845635ed07ce3b66a (diff) | |
parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
download | linux-fsl-qoriq-acf1cf6a1c0966ef64a73083ca985605a12b032d.tar.xz |
Merge 3.7-rc6 into staging-next
Diffstat (limited to 'arch/mips/fw/arc/misc.c')
-rw-r--r-- | arch/mips/fw/arc/misc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/fw/arc/misc.c b/arch/mips/fw/arc/misc.c index 7cf80ca..f9f5307 100644 --- a/arch/mips/fw/arc/misc.c +++ b/arch/mips/fw/arc/misc.c @@ -11,6 +11,7 @@ */ #include <linux/init.h> #include <linux/kernel.h> +#include <linux/irqflags.h> #include <asm/bcache.h> |