From 6f1151982b2086dd6bdbfb01a3607e83f14037b1 Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Fri, 6 Oct 2006 00:43:54 -0700
Subject: [PATCH] --- yaml --- r: 39039 b: refs/heads/master c:
 7236e978a3883406ca06ee79e0739743c7c92a85 h: refs/heads/master i:   39037:
 c7a03cd6ef1a54509713cf36c6fe74ad9f11a645   39035:
 0310333d6fe0d8413f5bb44ab46bbca2c6f8846c   39031:
 a3868bd84b9eb9d982ef0456dc7b44f52cdad4d1   39023:
 a17f36053f6dcaa99c61e58642a08698c6d6809e   39007:
 3eaee1d88beb28254a69013bb16ca245bbe032c9   38975:
 dc63371a47ae7680a6b4b5591a544c4c113b3fb8   38911:
 270a202d1785a666dee95f7a2fc3552880a8621f v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/timex.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 */