From 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 10 Dec 2010 09:46:24 -0800 Subject: omap1: Add initcall checks for omap1 and booted board Otherwise multi-omap1 configurations will fail. Tested-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/pm_bus.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-omap1/pm_bus.c') diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c index 8b66392be745..326644770ea8 100644 --- a/arch/arm/mach-omap1/pm_bus.c +++ b/arch/arm/mach-omap1/pm_bus.c @@ -73,6 +73,9 @@ static int __init omap1_pm_runtime_init(void) const struct dev_pm_ops *pm; struct dev_pm_ops *omap_pm; + if (!cpu_class_is_omap1()) + return -ENODEV; + pm = platform_bus_get_pm_ops(); if (!pm) { pr_err("%s: unable to get dev_pm_ops from platform_bus\n", -- cgit v1.2.1