diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:41:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:41:28 -0400 |
| commit | 142e27fc8a3619471669d6241784eec9167c47d1 (patch) | |
| tree | e88850b63ec910ee28874f93c43fb66421bb8119 /include/linux/time.h | |
| parent | a9053d0494d3c92807701c0f47df61d50c971581 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 5634497ff5df..c10d4c21c183 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -97,7 +97,6 @@ extern int do_settimeofday(struct timespec *tv); | |||
| 97 | extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); | 97 | extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); |
| 98 | extern void clock_was_set(void); // call when ever the clock is set | 98 | extern void clock_was_set(void); // call when ever the clock is set |
| 99 | extern int do_posix_clock_monotonic_gettime(struct timespec *tp); | 99 | extern int do_posix_clock_monotonic_gettime(struct timespec *tp); |
| 100 | extern long do_nanosleep(struct timespec *t); | ||
| 101 | extern long do_utimes(char __user * filename, struct timeval * times); | 100 | extern long do_utimes(char __user * filename, struct timeval * times); |
| 102 | struct itimerval; | 101 | struct itimerval; |
| 103 | extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); | 102 | extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); |