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/smp.h | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
download | linux-29308333fbe2cc61258c1c470f9403960428beb2.tar.gz |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/smp.h')
-rw-r--r-- | include/asm-x86/smp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 3c877f74f279..cd3c5f03fcaf 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_SMP_H_ -#define _ASM_X86_SMP_H_ +#ifndef ASM_X86__SMP_H +#define ASM_X86__SMP_H #ifndef __ASSEMBLY__ #include <linux/cpumask.h> #include <linux/init.h> @@ -205,4 +205,4 @@ extern void cpu_uninit(void); #endif #endif /* __ASSEMBLY__ */ -#endif +#endif /* ASM_X86__SMP_H */ |