Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / mtd / maps / physmap_of.c

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 217c25d..c1d21cb 100644 (file)
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -103,7 +103,7 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev,
                if (strcmp(of_probe, "ROM") != 0)
                        dev_warn(&dev->dev, "obsolete_probe: don't know probe "
                                 "type '%s', mapping as rom\n", of_probe);
-               return do_map_probe("mtd_rom", map);
+               return do_map_probe("map_rom", map);
        }
 }
 
@@ -339,6 +339,10 @@ static struct of_device_id of_flash_match[] = {
                .compatible     = "mtd-ram",
                .data           = (void *)"map_ram",
        },
+       {
+               .compatible     = "mtd-rom",
+               .data           = (void *)"map_rom",
+       },
        {
                .type           = "rom",
                .compatible     = "direct-mapped"