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-default/mach_apic.h | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/mach-default/mach_apic.h')
-rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h index f3226b9a6b8..b615f40736b 100644 --- a/include/asm-x86/mach-default/mach_apic.h +++ b/include/asm-x86/mach-default/mach_apic.h @@ -1,5 +1,5 @@ -#ifndef __ASM_MACH_APIC_H -#define __ASM_MACH_APIC_H +#ifndef ASM_X86__MACH_DEFAULT__MACH_APIC_H +#define ASM_X86__MACH_DEFAULT__MACH_APIC_H #ifdef CONFIG_X86_LOCAL_APIC @@ -138,4 +138,4 @@ static inline void enable_apic_mode(void) } #endif /* CONFIG_X86_LOCAL_APIC */ -#endif /* __ASM_MACH_APIC_H */ +#endif /* ASM_X86__MACH_DEFAULT__MACH_APIC_H */ |