diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/asm-x86/tsc.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
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 */ |