Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/kernel/profile.c b/kernel/profile.c
index 5a730fdb1a2cecf6b10c2112ba777fbb5fb7c794..68afe121e5071f0574e37e7b9e20f1d66bd4c290 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -299,7 +299,7 @@ out:
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int __devinit profile_cpu_callback(struct notifier_block *info,
+static int profile_cpu_callback(struct notifier_block *info,
                                        unsigned long action, void *__cpu)
 {
        int node, cpu = (unsigned long)__cpu;