diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-18 18:29:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-18 18:29:19 +0200 |
| commit | 17858ca65eef148d335ffd4cfc09228a1c1cbfb5 (patch) | |
| tree | 2147c4dff4ae9d28f0645683c71684520de191f9 | |
| parent | Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | [IA64] Fix include dependency in asm/irqflags.h (diff) | |
| download | linux-17858ca65eef148d335ffd4cfc09228a1c1cbfb5.tar.xz linux-17858ca65eef148d335ffd4cfc09228a1c1cbfb5.zip | |
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.h | 1 |
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; |