aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-18 06:29:19 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-18 06:29:19 -1000
commit17858ca65eef148d335ffd4cfc09228a1c1cbfb5 (patch)
tree2147c4dff4ae9d28f0645683c71684520de191f9
parent4c3577c58f7efcddeaa269e7ddbe75e8acfbb7de (diff)
parentf75773103d24faaa75323597c2804edfb4a48a52 (diff)
downloadlinux-linaro-stable-17858ca65eef148d335ffd4cfc09228a1c1cbfb5.tar.gz
Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 build fix from Tony Luck: "Fix ia64 build breakage by adding newly needed #include" We're still debating the patch that caused the build breakage, but this fix seems like a good idea regardless of how that ends up being handled. * tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Fix include dependency in asm/irqflags.h
-rw-r--r--arch/ia64/include/asm/irqflags.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h
index 1bf2cf2f4ab4..cec6c06b52c0 100644
--- a/arch/ia64/include/asm/irqflags.h
+++ b/arch/ia64/include/asm/irqflags.h
@@ -11,6 +11,7 @@
#define _ASM_IA64_IRQFLAGS_H
#include <asm/pal.h>
+#include <asm/kregs.h>
#ifdef CONFIG_IA64_DEBUG_IRQ
extern unsigned long last_cli_ip;