summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-03 10:12:27 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-11-04 22:28:13 +0100
commita96d69d1b02c4a526bd8c07e0cb10c129025c88c (patch)
treebc4a0258ae5d48b541fd25d40c3594e050dd5ac9
parentdef0c0a37d02820497fcd5a74b6cc93dbce5dc06 (diff)
PM / OPP: Fix build when CONFIG_PM_OPP is not set
Commit 03ca370fbf7b76d6d002380dbdc2cdc2319f9c80 (PM / OPP: Add OPP availability change notifier) does not compile if CONFIG_PM_OPP is not set: arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier': include/linux/opp.h:103: multiple definition of `opp_get_notifier' include/linux/opp.h:103: first defined here Also fix incorrect comment. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--include/linux/opp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/opp.h b/include/linux/opp.h
index 87a9208f8ae..ee94b33080c 100644
--- a/include/linux/opp.h
+++ b/include/linux/opp.h
@@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
return 0;
}
-struct srcu_notifier_head *opp_get_notifier(struct device *dev)
+static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
{
return ERR_PTR(-EINVAL);
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_OPP */
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
int opp_init_cpufreq_table(struct device *dev,