Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / include / linux / time.h

diff --git a/include/linux/time.h b/include/linux/time.h
index f2aca7ec63257e67cffba81dc93c6e04a019ba88..614dd8465839c215bebf815e1baaf11d6e399939 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -74,7 +74,7 @@ extern void do_gettimeofday(struct timeval *tv);
 extern int do_settimeofday(struct timespec *tv);
 extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz);
 #define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
-extern long do_utimes(char __user *filename, struct timeval *times);
+extern long do_utimes(int dfd, char __user *filename, struct timeval *times);
 struct itimerval;
 extern int do_setitimer(int which, struct itimerval *value,
                        struct itimerval *ovalue);