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

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

diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 2a2cfa88ddbfdd456b6522c678ac7321057ad517..59a4af779f421986fc6ea097cf1f33040bdaadf7 100644 (file)
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -51,8 +51,7 @@ static int __init omap_init_drm(void)
        oh = omap_hwmod_lookup("dmm");
 
        if (oh) {
-               pdev = omap_device_build(oh->name, -1, oh, NULL, 0, NULL, 0,
-                                       false);
+               pdev = omap_device_build(oh->name, -1, oh, NULL, 0);
                WARN(IS_ERR(pdev), "Could not build omap_device for %s\n",
                        oh->name);
        }
@@ -63,6 +62,6 @@ static int __init omap_init_drm(void)
 
 }
 
-arch_initcall(omap_init_drm);
+omap_arch_initcall(omap_init_drm);
 
 #endif