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/timex.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/timex.h')
| -rw-r--r-- | include/asm-x86/timex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/timex.h b/include/asm-x86/timex.h index 43e5a78500c5..d1ce2416a5da 100644 --- a/include/asm-x86/timex.h +++ b/include/asm-x86/timex.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* x86 architecture timex specifications */ | 1 | /* x86 architecture timex specifications */ |
| 2 | #ifndef _ASM_X86_TIMEX_H | 2 | #ifndef ASM_X86__TIMEX_H |
| 3 | #define _ASM_X86_TIMEX_H | 3 | #define ASM_X86__TIMEX_H |
| 4 | 4 | ||
| 5 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 6 | #include <asm/tsc.h> | 6 | #include <asm/tsc.h> |
| @@ -16,4 +16,4 @@ | |||
| 16 | 16 | ||
| 17 | #define ARCH_HAS_READ_CURRENT_TIMER | 17 | #define ARCH_HAS_READ_CURRENT_TIMER |
| 18 | 18 | ||
| 19 | #endif | 19 | #endif /* ASM_X86__TIMEX_H */ |