diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-20 03:59:41 -0500 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-20 03:59:41 -0500 |
| commit | 044399b2cb6ad2d7f63cfca945268853d7443a4d (patch) | |
| tree | 5f96eb307b0389ac0b919a4744a40862b615e9da /include/linux/time.h | |
| parent | 901359256b2666f52a3a7d3f31927677e91b3a2a (diff) | |
| parent | 18a4144028f056b77d6576d4eb284246e9c7ea97 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index f2aca7ec6325..614dd8465839 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -74,7 +74,7 @@ extern void do_gettimeofday(struct timeval *tv); | |||
| 74 | extern int do_settimeofday(struct timespec *tv); | 74 | extern int do_settimeofday(struct timespec *tv); |
| 75 | extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); | 75 | extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); |
| 76 | #define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts) | 76 | #define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts) |
| 77 | extern long do_utimes(char __user *filename, struct timeval *times); | 77 | extern long do_utimes(int dfd, char __user *filename, struct timeval *times); |
| 78 | struct itimerval; | 78 | struct itimerval; |
| 79 | extern int do_setitimer(int which, struct itimerval *value, | 79 | extern int do_setitimer(int which, struct itimerval *value, |
| 80 | struct itimerval *ovalue); | 80 | struct itimerval *ovalue); |