diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-x86/geode.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 */ |