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/timex.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/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 */ |