diff --git a/[refs] b/[refs]
index 84af56301e57..379a082b3cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a4734623e4f06752014336b05cf3ae77158892
+refs/heads/master: d50dcb1d0e1f8ebe11db1719aad5753cd1b4c4f8
diff --git a/trunk/drivers/mtd/maps/plat-ram.c b/trunk/drivers/mtd/maps/plat-ram.c
index 2de66b062f0d..71fdda29594b 100644
--- a/trunk/drivers/mtd/maps/plat-ram.c
+++ b/trunk/drivers/mtd/maps/plat-ram.c
@@ -199,7 +199,7 @@ static int platram_probe(struct platform_device *pdev)
 	 * supplied by the platform_data struct */
 
 	if (pdata->map_probes) {
-		const char **map_probes = pdata->map_probes;
+		const char * const *map_probes = pdata->map_probes;
 
 		for ( ; !info->mtd && *map_probes; map_probes++)
 			info->mtd = do_map_probe(*map_probes , &info->map);
diff --git a/trunk/include/linux/mtd/plat-ram.h b/trunk/include/linux/mtd/plat-ram.h
index e07890aff1cf..44212d65aa97 100644
--- a/trunk/include/linux/mtd/plat-ram.h
+++ b/trunk/include/linux/mtd/plat-ram.h
@@ -20,8 +20,8 @@
 
 struct platdata_mtd_ram {
 	const char		*mapname;
-	const char		**map_probes;
-	const char		**probes;
+	const char * const      *map_probes;
+	const char * const      *probes;
 	struct mtd_partition	*partitions;
 	int			 nr_partitions;
 	int			 bankwidth;