Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / arch / arm / mach-s3c / mach-jive.c

diff --git a/arch/arm/mach-s3c/mach-jive.c b/arch/arm/mach-s3c/mach-jive.c
index 285e1f0..0d7d408 100644 (file)
--- a/arch/arm/mach-s3c/mach-jive.c
+++ b/arch/arm/mach-s3c/mach-jive.c
@@ -236,11 +236,11 @@ static int __init jive_mtdset(char *options)
        unsigned long set;
 
        if (options == NULL || options[0] == '\0')
-               return 0;
+               return 1;
 
        if (kstrtoul(options, 10, &set)) {
                printk(KERN_ERR "failed to parse mtdset=%s\n", options);
-               return 0;
+               return 1;
        }
 
        switch (set) {
@@ -256,7 +256,7 @@ static int __init jive_mtdset(char *options)
                       "using default.", set);
        }
 
-       return 0;
+       return 1;
 }
 
 /* parse the mtdset= option given to the kernel command line */