diff --git a/[refs] b/[refs]
index a9b482ba4fbd..8dd7e4c21b85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afffeec9e0cf991e5cf697abdb89123ec708f097
+refs/heads/master: ccef4dcc5a1628dd662297b028f08e0b06bbf05e
diff --git a/trunk/drivers/mtd/mtdpart.c b/trunk/drivers/mtd/mtdpart.c
index 9ee0911025c8..301493382cd0 100644
--- a/trunk/drivers/mtd/mtdpart.c
+++ b/trunk/drivers/mtd/mtdpart.c
@@ -694,7 +694,7 @@ EXPORT_SYMBOL_GPL(deregister_mtd_parser);
  * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you
  * are changing this array!
  */
-static const char *default_mtd_part_types[] = {
+static const char * const default_mtd_part_types[] = {
 	"cmdlinepart",
 	"ofpart",
 	NULL