Merge commit 'v2.6.30-rc5' into next

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/time.h b/include/linux/time.h
index fbbd2a1c92ba..242f62499bb7 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -12,14 +12,14 @@
 #ifndef _STRUCT_TIMESPEC
 #define _STRUCT_TIMESPEC
 struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
+        __kernel_time_t tv_sec;                 /* seconds */
+        long            tv_nsec;                /* nanoseconds */
 };
 #endif
 
 struct timeval {
-        time_t          tv_sec;         /* seconds */
-        suseconds_t     tv_usec;        /* microseconds */
+        __kernel_time_t         tv_sec;         /* seconds */
+        __kernel_suseconds_t    tv_usec;        /* microseconds */
 };
 
 struct timezone {