diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
| tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/geode.h | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 2c1cda0b8a86..3f3444be2638 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> |
| @@ -250,4 +250,4 @@ extern int __init mfgpt_timer_setup(void); | |||
| 250 | static inline int mfgpt_timer_setup(void) { return 0; } | 250 | static inline int mfgpt_timer_setup(void) { return 0; } |
| 251 | #endif | 251 | #endif |
| 252 | 252 | ||
| 253 | #endif | 253 | #endif /* ASM_X86__GEODE_H */ |