Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for...

[~andy/linux] / arch / mips / mm / c-r4k.c

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index d2b5b0c7afa0d17e9e3b07e6e3971dbd01b9f77c..0f7d788e88106fafa98e824d8b6d22f0bdcd2067 100644 (file)
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1333,10 +1333,10 @@ static int __init cca_setup(char *str)
 {
        get_option(&str, &cca);
 
-       return 1;
+       return 0;
 }
 
-__setup("cca=", cca_setup);
+early_param("cca", cca_setup);
 
 static void __cpuinit coherency_setup(void)
 {
@@ -1386,10 +1386,10 @@ static int __init setcoherentio(char *str)
 {
        coherentio = 1;
 
-       return 1;
+       return 0;
 }
 
-__setup("coherentio", setcoherentio);
+early_param("coherentio", setcoherentio);
 #endif
 
 static void __cpuinit r4k_cache_error_setup(void)