From 9acd96b108f57379f1e2046202c4a7b84ef763ea Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 1 Feb 2011 09:34:58 +0100
Subject: [PATCH] --- yaml --- r: 234588 b: refs/heads/master c:
 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/kernel/time/tick-internal.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 79d584f0050d..bf08af228027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2830b5c1b2b2217894370a3b95af87d4a958401
+refs/heads/master: 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4
diff --git a/trunk/kernel/time/tick-internal.h b/trunk/kernel/time/tick-internal.h
index 28c578568c9d..f77b93df0006 100644
--- a/trunk/kernel/time/tick-internal.h
+++ b/trunk/kernel/time/tick-internal.h
@@ -4,6 +4,8 @@
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
 
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
+
 #define TICK_DO_TIMER_NONE	-1
 #define TICK_DO_TIMER_BOOT	-2
 
@@ -135,5 +137,7 @@ static inline int tick_device_is_functional(struct clock_event_device *dev)
 	return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
 }
 
+#endif
+
 extern void do_timer(unsigned long ticks);
 extern seqlock_t xtime_lock;