summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/fb.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-01-11 11:24:18 -0800
committerTony Lindgren <tony@atomide.com>2013-01-11 11:24:18 -0800
commitb76c8b19b082c3fc84725de0d3ba5ee1f571c0ae (patch)
tree7681e38be4fa99573874a8796afbf54ded1feb0b /arch/arm/mach-omap2/fb.c
parent816a65ef4ce1848d8083d9e198922ddafbe221f2 (diff)
ARM: OMAP2+: Use omap initcalls
This way the initcalls don't run on other SoCs on multiplatform kernels. Otherwise we'll get something like this when booting on vexpress: omap_hwmod: _ensure_mpu_hwmod_is_setup: MPU initiator hwmod mpu not yet registered ... WARNING: at arch/arm/mach-omap2/pm.c:82 _init_omap_device+0x74/0x94() _init_omap_device: could not find omap_hwmod for mpu ... omap-dma-engine omap-dma-engine: OMAP DMA engine driver ... Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/fb.c')
-rw-r--r--arch/arm/mach-omap2/fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c
index d9bd965f6d0..190ae493c6e 100644
--- a/arch/arm/mach-omap2/fb.c
+++ b/arch/arm/mach-omap2/fb.c
@@ -89,7 +89,7 @@ static int __init omap_init_vrfb(void)
return 0;
}
-arch_initcall(omap_init_vrfb);
+omap_arch_initcall(omap_init_vrfb);
#endif
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
@@ -113,6 +113,6 @@ static int __init omap_init_fb(void)
return platform_device_register(&omap_fb_device);
}
-arch_initcall(omap_init_fb);
+omap_arch_initcall(omap_init_fb);
#endif