summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/emu.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 21:26:48 +0100
committerTony Lindgren <tony@atomide.com>2010-02-15 18:27:05 +0100
commit4323e9f71903f654abc6d21a3ef81c08e0ac2288 (patch)
treeacccee89ce2e54eaaf0584175e981da4081cad2e /arch/arm/mach-omap2/emu.c
parentomap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS (diff)
downloadlinux-4323e9f71903f654abc6d21a3ef81c08e0ac2288.tar.xz
linux-4323e9f71903f654abc6d21a3ef81c08e0ac2288.zip
omap2/3: Fix initcalls for multi-omap
Otherwise the wrong initcalls can run. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to '')
-rw-r--r--arch/arm/mach-omap2/emu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c
index ec0d984a26fc..9c442e290ccb 100644
--- a/arch/arm/mach-omap2/emu.c
+++ b/arch/arm/mach-omap2/emu.c
@@ -56,6 +56,9 @@ static struct amba_device omap3_etm_device = {
static int __init emu_init(void)
{
+ if (!cpu_is_omap34xx())
+ return -ENODEV;
+
amba_device_register(&omap3_etb_device, &iomem_resource);
amba_device_register(&omap3_etm_device, &iomem_resource);