Subject: [PATCH] ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n

From: [email-masked] (Tony Lindgren)
Date: Wed, 14 Nov 2012 17:31:54 -0800

* Kevin Hilman <[email-masked]> [121114 17:15]:
> From: Kevin Hilman <[email-masked]>
> 
> commit 908b75e8 (ARM: OMAP: add support for oscillator setup) added a new
> API for oscillator setup, but is broken when CONFIG_PM=n.
> 
> The new functions have dummy definitions when CONFIG_PM=n, but also have
> full implementations available, which conflict.
> 
> To fix, wrap the PM implmentations in #ifdef CONFIG_PM.
> 
> Cc: Tero Kristo <[email-masked]>
> Signed-off-by: Kevin Hilman <[email-masked]>
> ---
> This applies to Tony's omap-for-v3.8/pm branch, which includes my
> for_3.8-pm-voltage tag where this bug was introduced.

Thanks for fixing this quickly. Applied to omap-for-v3.8/pm-part2
and pushed out.

Regards,

Tony