Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

[linux-2.6-omap-h63xx.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index ef3fa6906e8f1c33abb92cf056cc0ca5aef40a62..03bc7f1f159350d2ad29ca45d3b3a28fc275f296 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1494,7 +1494,7 @@ void __init init_timers(void)
 
        BUG_ON(err == NOTIFY_BAD);
        register_cpu_notifier(&timers_nb);
-       open_softirq(TIMER_SOFTIRQ, run_timer_softirq, NULL);
+       open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
 }
 
 /**