Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[powerpc.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 26671f4..2a00c22 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
        }
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
        tvec_base_t *old_base;
        tvec_base_t *new_base;