lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PM / OPP: Fix build when CONFIG_PM_OPP is not set

Browse Source 
Commit 03ca370fbf (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>
This commit is contained in:
Tony Lindgren
2011-11-03 10:12:27 +01:00
committed by Rafael J. Wysocki
parent def0c0a37d
commit a96d69d1b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/opp.h
View File

@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
return 0; 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); return ERR_PTR(-EINVAL);
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_OPP */
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP) #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
int opp_init_cpufreq_table(struct device *dev, int opp_init_cpufreq_table(struct device *dev,