diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /arch/x86/include/asm/genapic.h | |
| parent | tracing: trace_bprintk() cleanups (diff) | |
| parent | x86: implement atomic text_poke() via fixmap (diff) | |
| download | linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.tar.xz linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.zip | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'arch/x86/include/asm/genapic.h')
| -rw-r--r-- | arch/x86/include/asm/genapic.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h index d48bee663a6f..4b8b98fa7f25 100644 --- a/arch/x86/include/asm/genapic.h +++ b/arch/x86/include/asm/genapic.h @@ -1,5 +1 @@ -#ifdef CONFIG_X86_32 -# include "genapic_32.h" -#else -# include "genapic_64.h" -#endif +#include <asm/apic.h> |