Merge branches 'fixes' and 'misc' into for-linus

[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 7d15b84..0d7d408 100644 (file)
--- a/arch/arm/mach-s3c/mach-jive.c
+++ b/arch/arm/mach-s3c/mach-jive.c
@@ -247,6 +247,7 @@ static int __init jive_mtdset(char *options)
        case 1:
                nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part);
                nand->partitions = jive_imageB_nand_part;
+               break;
        case 0:
                /* this is already setup in the nand info */
                break;