git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.35' into kbuild/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
emu.c
diff --git
a/arch/arm/mach-omap2/emu.c
b/arch/arm/mach-omap2/emu.c
index
ec0d984
..
9c442e2
100644
(file)
--- 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)
{
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);
amba_device_register(&omap3_etb_device, &iomem_resource);
amba_device_register(&omap3_etm_device, &iomem_resource);