Merge remote-tracking branch 'pm/linux-next'

[karo-tx-linux.git] / drivers / base / power / clock_ops.c

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 6ce76934057fcc15831a85400754c551294b35d9..60ee5591ee8f0d58d8229bad412d0f5882064e6a 100644 (file)
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -17,7 +17,7 @@
 #include <linux/err.h>
 #include <linux/pm_runtime.h>
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_CLK
 
 enum pce_status {
        PCE_STATUS_NONE = 0,
@@ -406,7 +406,7 @@ int pm_clk_runtime_resume(struct device *dev)
        return pm_generic_runtime_resume(dev);
 }
 
-#else /* !CONFIG_PM */
+#else /* !CONFIG_PM_CLK */
 
 /**
  * enable_clock - Enable a device clock.
@@ -486,7 +486,7 @@ static int pm_clk_notify(struct notifier_block *nb,
        return 0;
 }
 
-#endif /* !CONFIG_PM */
+#endif /* !CONFIG_PM_CLK */
 
 /**
  * pm_clk_add_notifier - Add bus type notifier for power management clocks.