diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
| commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/cpufeature.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/cpufeature.h')
| -rw-r--r-- | include/asm-x86/cpufeature.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 2f5a792b0acc..2f3143e45149 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Defines x86 CPU feature bits | 2 | * Defines x86 CPU feature bits |
| 3 | */ | 3 | */ |
| 4 | #ifndef _ASM_X86_CPUFEATURE_H | 4 | #ifndef ASM_X86__CPUFEATURE_H |
| 5 | #define _ASM_X86_CPUFEATURE_H | 5 | #define ASM_X86__CPUFEATURE_H |
| 6 | 6 | ||
| 7 | #include <asm/required-features.h> | 7 | #include <asm/required-features.h> |
| 8 | 8 | ||
| @@ -220,4 +220,4 @@ extern const char * const x86_power_flags[32]; | |||
| 220 | 220 | ||
| 221 | #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ | 221 | #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ |
| 222 | 222 | ||
| 223 | #endif /* _ASM_X86_CPUFEATURE_H */ | 223 | #endif /* ASM_X86__CPUFEATURE_H */ |