Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 878194ec8bd6a45043d32f1da3534229eda2d14d..5a8960253063d00495366a48d92e06e5eb4133fa 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1672,7 +1672,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block timers_nb = {
+static struct notifier_block __devinitdata timers_nb = {
        .notifier_call  = timer_cpu_notify,
 };