Merge branch 'akpm' (second patchbomb from Andrew Morton)

[linux-2.6-block.git] / arch / arm / mach-s3c24xx / mach-jive.c

diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index e647b47244a947f0dff96d1d991af7e50908e5e6..7804d3c6991b769eb68aa630bd495bbd53c7e820 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -242,7 +242,7 @@ static int __init jive_mtdset(char *options)
        if (options == NULL || options[0] == '\0')
                return 0;
 
-       if (strict_strtoul(options, 10, &set)) {
+       if (kstrtoul(options, 10, &set)) {
                printk(KERN_ERR "failed to parse mtdset=%s\n", options);
                return 0;
        }