From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/maps/Makefile     |    1 +
 drivers/mtd/maps/physmap_of.c |    1 -
 mtd/nand/Kconfig              |    0 
 3 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/mtd/maps/Kconfig~git-mtd-vs-powerpc drivers/mtd/maps/Kconfig
diff -puN drivers/mtd/maps/Makefile~git-mtd-vs-powerpc drivers/mtd/maps/Makefile
--- a/drivers/mtd/maps/Makefile~git-mtd-vs-powerpc
+++ a/drivers/mtd/maps/Makefile
@@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_SHARP_SL)	+= sharpsl-fl
 obj-$(CONFIG_MTD_PLATRAM)	+= plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)	+= omap_nor.o
 obj-$(CONFIG_MTD_MTX1)		+= mtx-1_flash.o
+obj-$(CONFIG_MTD_INTEL_VR_NOR)	+= intel_vr_nor.o
diff -puN drivers/mtd/maps/physmap_of.c~git-mtd-vs-powerpc drivers/mtd/maps/physmap_of.c
--- a/drivers/mtd/maps/physmap_of.c~git-mtd-vs-powerpc
+++ a/drivers/mtd/maps/physmap_of.c
@@ -232,7 +232,6 @@ static int __devinit of_flash_probe(stru
 	info = kzalloc(sizeof(*info), GFP_KERNEL);
 	if (!info)
 		goto err_out;
-	memset(info, 0, sizeof(*info));
 
 	dev_set_drvdata(&dev->dev, info);
 
diff -puN drivers/mtd/nand/Kconfig~git-mtd-vs-powerpc drivers/mtd/nand/Kconfig
_