diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-12 15:26:48 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:27:05 -0500 |
commit | 4323e9f71903f654abc6d21a3ef81c08e0ac2288 (patch) | |
tree | acccee89ce2e54eaaf0584175e981da4081cad2e /arch/arm/mach-omap2/emu.c | |
parent | 140455fa007a618d2d1bf5e6e888206534035e6f (diff) |
omap2/3: Fix initcalls for multi-omap
Otherwise the wrong initcalls can run.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/emu.c')
-rw-r--r-- | arch/arm/mach-omap2/emu.c | 3 |
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 = { | |||
56 | 56 | ||
57 | static int __init emu_init(void) | 57 | static int __init emu_init(void) |
58 | { | 58 | { |
59 | if (!cpu_is_omap34xx()) | ||
60 | return -ENODEV; | ||
61 | |||
59 | amba_device_register(&omap3_etb_device, &iomem_resource); | 62 | amba_device_register(&omap3_etb_device, &iomem_resource); |
60 | amba_device_register(&omap3_etm_device, &iomem_resource); | 63 | amba_device_register(&omap3_etm_device, &iomem_resource); |
61 | 64 | ||