Merge branch 'linux-2.6'

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index c13170bc675c..b55c2d1b998f 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -100,7 +100,7 @@ static inline int __init mips_sc_probe(void)
         return 1;
 }
 
-int __init mips_sc_init(void)
+int __cpuinit mips_sc_init(void)
 {
         int found = mips_sc_probe();
         if (found) {
@@ -109,4 +109,3 @@ int __init mips_sc_init(void)
         }
         return found;
 }
-