Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/kernel/cpu.c b/kernel/cpu.c
index e0d3a4f56ecbddb4a4c87c714bc49991fefa2cc2..2eff3f63abed6c91c2bbcb1c8d0eccbb97d54c7d 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -389,7 +389,7 @@ int disable_nonboot_cpus(void)
        return error;
 }
 
-void enable_nonboot_cpus(void)
+void __ref enable_nonboot_cpus(void)
 {
        int cpu, error;