summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/pm.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-10 18:46:24 +0100
committerTony Lindgren <tony@atomide.com>2010-12-10 18:46:24 +0100
commit7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b (patch)
tree5077dcdafcf3281b94ef31eee399c35e7bfadf4b /arch/arm/mach-omap1/pm.c
parentomap: Split omap_read/write functions for omap1 and omap2+ (diff)
downloadlinux-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.tar.xz
linux-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.zip
omap1: Add initcall checks for omap1 and booted board
Otherwise multi-omap1 configurations will fail. Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
-rw-r--r--arch/arm/mach-omap1/pm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index b1d3f9fade23..0cca23a85175 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -661,6 +661,9 @@ static int __init omap_pm_init(void)
int error;
#endif
+ if (!cpu_class_is_omap1())
+ return -ENODEV;
+
printk("Power Management for TI OMAP.\n");
/*