diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/ia64/include/asm/gcc_intrin.h | |
parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (diff) |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/ia64/include/asm/gcc_intrin.h')
-rw-r--r-- | arch/ia64/include/asm/gcc_intrin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/gcc_intrin.h b/arch/ia64/include/asm/gcc_intrin.h index 0f5b5592175..c2c5fd8fcac 100644 --- a/arch/ia64/include/asm/gcc_intrin.h +++ b/arch/ia64/include/asm/gcc_intrin.h @@ -6,6 +6,7 @@ * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com> */ +#include <linux/types.h> #include <linux/compiler.h> /* define this macro to get some asm stmts included in 'c' files */ |