Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 85c0e7b..eb870ad 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -67,7 +67,7 @@ typedef __kernel_ptrdiff_t    ptrdiff_t;
 
 #ifndef _TIME_T
 #define _TIME_T
-typedef __kernel_time_t                time_t;
+typedef __kernel_old_time_t    time_t;
 #endif
 
 #ifndef _CLOCK_T