diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /include/asm-x86_64/timex.h | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-x86_64/timex.h')
| -rw-r--r-- | include/asm-x86_64/timex.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index 24ecf6a637cb..f971f45d6d78 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _ASMx8664_TIMEX_H | 6 | #ifndef _ASMx8664_TIMEX_H |
| 7 | #define _ASMx8664_TIMEX_H | 7 | #define _ASMx8664_TIMEX_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/8253pit.h> | 9 | #include <asm/8253pit.h> |
| 11 | #include <asm/msr.h> | 10 | #include <asm/msr.h> |
| 12 | #include <asm/vsyscall.h> | 11 | #include <asm/vsyscall.h> |