summaryrefslogtreecommitdiff
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-06-17 20:47:38 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-06-17 20:47:38 -0700
commit3986594c6167a269053d3d88f17e53e0ca4023f8 (patch)
tree316dc9079f5be1fab7edb4c53fdc0182bb457e7a /include/linux/timer.h
parent5567614b40b53cf9abe6e8370f40d19a9206f2ed (diff)
parent73769d9baca2040c407de7230377d440b9d11997 (diff)
Merge master.kernel.org:/home/mingo/bk-misc
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index d6f0ce5f8740..6e1e61a4c07b 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -25,10 +25,8 @@ extern int del_timer(struct timer_list * timer);
#ifdef CONFIG_SMP
extern int del_timer_sync(struct timer_list * timer);
-extern void sync_timers(void);
#else
#define del_timer_sync(t) del_timer(t)
-#define sync_timers() do { } while (0)
#endif
/*