diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:28:36 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:28:36 +0200 |
commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/mach-es7000/mach_apicdef.h | |
parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
parent | Merge branch 'linus' into x86/header-guards (diff) | |
download | linux-29308333fbe2cc61258c1c470f9403960428beb2.tar.xz linux-29308333fbe2cc61258c1c470f9403960428beb2.zip |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/mach-es7000/mach_apicdef.h')
-rw-r--r-- | include/asm-x86/mach-es7000/mach_apicdef.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mach-es7000/mach_apicdef.h b/include/asm-x86/mach-es7000/mach_apicdef.h index a58ab5a75c8c..a07e56744028 100644 --- a/include/asm-x86/mach-es7000/mach_apicdef.h +++ b/include/asm-x86/mach-es7000/mach_apicdef.h @@ -1,5 +1,5 @@ -#ifndef __ASM_MACH_APICDEF_H -#define __ASM_MACH_APICDEF_H +#ifndef ASM_X86__MACH_ES7000__MACH_APICDEF_H +#define ASM_X86__MACH_ES7000__MACH_APICDEF_H #define APIC_ID_MASK (0xFF<<24) @@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x) #define GET_APIC_ID(x) get_apic_id(x) -#endif +#endif /* ASM_X86__MACH_ES7000__MACH_APICDEF_H */ |