Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/dt-s5pv210

1 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index f9874ba60cc8..108939f8d053 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -329,6 +329,11 @@ static struct mtd_partition collie_partitions[] = {
                 .name           = "rootfs",
                 .offset         = MTDPART_OFS_APPEND,
                 .size           = 0x00e20000,
+        }, {
+                .name           = "bootblock",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 0x00020000,
+                .mask_flags     = MTD_WRITEABLE
         }
 };
 
@@ -356,7 +361,7 @@ static void collie_flash_exit(void)
 }
 
 static struct flash_platform_data collie_flash_data = {
-        .map_name       = "jedec_probe",
+        .map_name       = "cfi_probe",
         .init           = collie_flash_init,
         .set_vpp        = collie_set_vpp,
         .exit           = collie_flash_exit,