Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[deliverable/linux.git] / arch / arm / mach-omap2 / msdi.c

diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c
index aafdd4ca9f4fc0ac4f7ea2fbf9b83bfce21888d1..c52d8b4a3e9152e84a95749e9e088f2532d10124 100644 (file)
--- a/arch/arm/mach-omap2/msdi.c
+++ b/arch/arm/mach-omap2/msdi.c
@@ -150,7 +150,7 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)
                return;
        }
        pdev = omap_device_build(dev_name, id, oh, mmc_data[0],
-                                sizeof(struct omap_mmc_platform_data), NULL, 0, 0);
+                                sizeof(struct omap_mmc_platform_data));
        if (IS_ERR(pdev))
                WARN(1, "Can'd build omap_device for %s:%s.\n",
                                        dev_name, oh->name);