Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[pandora-kernel.git] / arch / parisc / kernel / smp.c

diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 5b6bc6e..3b67d11 100644 (file)
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -611,7 +611,7 @@ void smp_cpus_done(unsigned int cpu_max)
 }
 
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
        if (cpu != 0 && cpu < parisc_max_cpus)
                smp_boot_one_cpu(cpu);