Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel...

[cascardo/linux.git] / include / linux / timex.h

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 782ccd4..94f8fae 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -264,11 +264,7 @@ static inline int ntp_synced(void)
 
 #define NTP_SCALE_SHIFT                32
 
-#ifdef CONFIG_NO_HZ
-#define NTP_INTERVAL_FREQ  (2)
-#else
 #define NTP_INTERVAL_FREQ  (HZ)
-#endif
 #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
 
 /* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */