| commit | 4323e9f71903f654abc6d21a3ef81c08e0ac2288 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Fri Feb 12 12:26:48 2010 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Feb 15 09:27:05 2010 -0800 |
| tree | acccee89ce2e54eaaf0584175e981da4081cad2e | |
| parent | 140455fa007a618d2d1bf5e6e888206534035e6f [diff] [blame] |
omap2/3: Fix initcalls for multi-omap Otherwise the wrong initcalls can run. Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c index ec0d984..9c442e2 100644 --- a/arch/arm/mach-omap2/emu.c +++ b/arch/arm/mach-omap2/emu.c
@@ -56,6 +56,9 @@ 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);