diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-20 00:47:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-20 00:47:49 -0700 |
| commit | 8f421acbbdc3daba1682bdf7b99083f4725ce5d3 (patch) | |
| tree | 28d8e5910bd466ed487654d5e62269b8446a80bd /include/linux/timex.h | |
| parent | 2d0ed1066cf5dd005c518be917649ca3f3b5c961 (diff) | |
| parent | b009a1c6a6c0273f60d96eca2561bc79da3b6614 (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/akpm
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/timex.h')
| -rw-r--r-- | include/linux/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index 5b2b0ac18ae7..6c00606c6e33 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -51,7 +51,6 @@ #ifndef _LINUX_TIMEX_H #define _LINUX_TIMEX_H -#include <linux/time.h> #include <asm/param.h> /* @@ -177,6 +176,7 @@ /* a value TUSEC for TICK_USEC (can be set bij adjtimex) */ #define TICK_NSEC(TUSEC) (SH_DIV (TUSEC * USER_HZ * 1000, ACTHZ, 8)) +#include <linux/time.h> /* * syscall interface - used (mainly by NTP daemon) * to discipline kernel clock oscillator |