summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rx51-video.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-01-11 20:24:18 +0100
committerTony Lindgren <tony@atomide.com>2013-01-11 20:24:18 +0100
commitb76c8b19b082c3fc84725de0d3ba5ee1f571c0ae (patch)
tree7681e38be4fa99573874a8796afbf54ded1feb0b /arch/arm/mach-omap2/board-rx51-video.c
parentARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels (diff)
downloadlinux-b76c8b19b082c3fc84725de0d3ba5ee1f571c0ae.tar.xz
linux-b76c8b19b082c3fc84725de0d3ba5ee1f571c0ae.zip
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/board-rx51-video.c')
-rw-r--r--arch/arm/mach-omap2/board-rx51-video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 46f4fc982766..eb667261df08 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -18,6 +18,7 @@
#include <video/omapdss.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
+#include "soc.h"
#include "board-rx51.h"
#include "mux.h"
@@ -85,5 +86,5 @@ static int __init rx51_video_init(void)
return 0;
}
-subsys_initcall(rx51_video_init);
+omap_subsys_initcall(rx51_video_init);
#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */