2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 66e8200079c2..1f749d58ae6f 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -85,6 +85,7 @@ static int physmap_flash_probe(struct platform_device *dev)
         struct physmap_flash_data *physmap_data;
         struct physmap_flash_info *info;
         const char **probe_type;
+        const char **part_types;
         int err = 0;
         int i;
         int devices_found = 0;
@@ -171,7 +172,9 @@ static int physmap_flash_probe(struct platform_device *dev)
         if (err)
                 goto err_out;
 
-        mtd_device_parse_register(info->cmtd, part_probe_types, 0,
+        part_types = physmap_data->part_probe_types ? : part_probe_types;
+
+        mtd_device_parse_register(info->cmtd, part_types, 0,
                                   physmap_data->parts, physmap_data->nr_parts);
         return 0;
 
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
index 04e018160e2b..d2887e76b7f6 100644
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -30,6 +30,7 @@ struct physmap_flash_data {
         unsigned int            pfow_base;
         char                    *probe_type;
         struct mtd_partition    *parts;
+        const char              **part_probe_types;
 };
 
 #endif /* __LINUX_MTD_PHYSMAP__ */