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/geode.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/geode.h')
| -rw-r--r-- | include/asm-x86/geode.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index bb06027fc83e..1ef738e01a06 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h | |||
| @@ -7,8 +7,8 @@ | |||
| 7 | * as published by the Free Software Foundation. | 7 | * as published by the Free Software Foundation. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #ifndef _ASM_GEODE_H_ | 10 | #ifndef ASM_X86__GEODE_H |
| 11 | #define _ASM_GEODE_H_ | 11 | #define ASM_X86__GEODE_H |
| 12 | 12 | ||
| 13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| @@ -249,4 +249,4 @@ extern int __init mfgpt_timer_setup(void); | |||
| 249 | static inline int mfgpt_timer_setup(void) { return 0; } | 249 | static inline int mfgpt_timer_setup(void) { return 0; } |
| 250 | #endif | 250 | #endif |
| 251 | 251 | ||
| 252 | #endif | 252 | #endif /* ASM_X86__GEODE_H */ |