Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

[linux-2.6] / include / asm-mips / smp.h

diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h
index 5a4fad910d82529d53d55c36d0e7f82b4e1f5ab2..e14e4b69de21d1a3a21838cfa79ed2e7696ecf2e 100644 (file)
--- a/include/asm-mips/smp.h
+++ b/include/asm-mips/smp.h
@@ -85,9 +85,9 @@ extern void prom_init_secondary(void);
 extern void plat_smp_setup(void);
 
 /*
- * Called after init_IRQ but before __cpu_up.
+ * Called in smp_prepare_cpus.
  */
-extern void prom_prepare_cpus(unsigned int max_cpus);
+extern void plat_prepare_cpus(unsigned int max_cpus);
 
 /*
  * Last chance for the board code to finish SMP initialization before