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/tsc.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/tsc.h')
| -rw-r--r-- | include/asm-x86/tsc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index cb6f6ee45b8f..ad0f5c41e78c 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * x86 TSC related functions | 2 | * x86 TSC related functions |
| 3 | */ | 3 | */ |
| 4 | #ifndef _ASM_X86_TSC_H | 4 | #ifndef ASM_X86__TSC_H |
| 5 | #define _ASM_X86_TSC_H | 5 | #define ASM_X86__TSC_H |
| 6 | 6 | ||
| 7 | #include <asm/processor.h> | 7 | #include <asm/processor.h> |
| 8 | 8 | ||
| @@ -59,4 +59,4 @@ extern void check_tsc_sync_target(void); | |||
| 59 | 59 | ||
| 60 | extern int notsc_setup(char *); | 60 | extern int notsc_setup(char *); |
| 61 | 61 | ||
| 62 | #endif | 62 | #endif /* ASM_X86__TSC_H */ |