Merge commit 'linus/master' into merge-linus

[safe/jmp/linux-2.6] / include / linux / time.h

diff --git a/include/linux/time.h b/include/linux/time.h
index 7269764..c911ef6 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -29,6 +29,8 @@ struct timezone {
 
 #ifdef __KERNEL__
 
+extern struct timezone sys_tz;
+
 /* Parameters used to convert the timespec values: */
 #define MSEC_PER_SEC   1000L
 #define USEC_PER_MSEC  1000L