diff --git a/[refs] b/[refs]
index 12a6efb3a0f6..1c31ee7a4f81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f7bbbe50b8a28f4dfaa4cea939ddb50198c4a99
+refs/heads/master: 7236e978a3883406ca06ee79e0739743c7c92a85
diff --git a/trunk/include/linux/timex.h b/trunk/include/linux/timex.h
index 049dfe4a11f2..db501dc23c29 100644
--- a/trunk/include/linux/timex.h
+++ b/trunk/include/linux/timex.h
@@ -293,6 +293,9 @@ extern void second_overflow(void);
 extern void update_ntp_one_tick(void);
 extern int do_adjtimex(struct timex *);
 
+/* Don't use! Compatibility define for existing users. */
+#define tickadj	(500/HZ ? : 1)
+
 #endif /* KERNEL */
 
 #endif /* LINUX_TIMEX_H */