diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-omap2/emu.c | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
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 | ||