Skip to content

Commit

Permalink
PM / OPP: Fix build when CONFIG_PM_OPP is not set
Browse files Browse the repository at this point in the history
Commit 03ca370 (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>
  • Loading branch information
Tony Lindgren authored and Rafael J. Wysocki committed Nov 4, 2011
1 parent def0c0a commit a96d69d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/linux/opp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a96d69d

Please sign in to comment.