---

yaml --- r: 234588 b: refs/heads/master c: 7cf37e8 h: refs/heads/master v: v3
git-mirror · Feb 1, 2011 · 9acd96b · 9acd96b
1 parent 4c3f61a
commit 9acd96b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;