PM / OPP: Fix build when CONFIG_PM_OPP is not set

2011-11-02 Thread Tony Lindgren 
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.

Cc: MyungJoo Ham myungjoo@samsung.com
Cc: Kyungmin Park kyungmin.p...@samsung.com
Cc: Mike Turquette mturque...@ti.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rafael J. Wysocki r...@sisk.pl
Signed-off-by: Tony Lindgren t...@atomide.com
---

I'm seeing this with omap1_defconfig at least.

--- 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,
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: PM / OPP: Fix build when CONFIG_PM_OPP is not set

2011-11-02 Thread Rafael J. Wysocki 
On Wednesday, November 02, 2011, Tony Lindgren wrote:
 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.
 
 Cc: MyungJoo Ham myungjoo@samsung.com
 Cc: Kyungmin Park kyungmin.p...@samsung.com
 Cc: Mike Turquette mturque...@ti.com
 Cc: Kevin Hilman khil...@ti.com
 Cc: Rafael J. Wysocki r...@sisk.pl
 Signed-off-by: Tony Lindgren t...@atomide.com

Applied to linux-pm/linux-next.

Thanks,
Rafael


 ---
 
 I'm seeing this with omap1_defconfig at least.
 
 --- 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,
 
 

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html