Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / 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 8b66392be745f5ef7fb3dae31daf99f0895a3960..6588c22b8a64116dd11004001e2682aa14fe423e 100644 (file)
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -48,7 +48,6 @@ static int omap1_pm_runtime_suspend(struct device *dev)
 
 static int omap1_pm_runtime_resume(struct device *dev)
 {
-       int ret = 0;
        struct clk *iclk, *fclk;
 
        dev_dbg(dev, "%s\n", __func__);
@@ -73,6 +72,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",