Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

17858ca6 · Linus Torvalds <[email protected]> · 2013-06-18 06:29:19 -10:00

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

Commit: 17858ca65eef148d335ffd4cfc09228a1c1cbfb5
Parents: 4c3577c5 · f7577310

Merge commit. Changes below are compared with the first parent: 4c3577c5.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/ia64/include/asm/irqflags.h	modified	+1	−0	View file

arch/ia64/include/asm/irqflags.h

View file

diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h
index 1bf2cf2..cec6c06 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;