From: Kevin Hilman Date: Thu, 15 Nov 2012 01:13:04 +0000 (-0800) Subject: ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n X-Git-Tag: omap-for-v3.8/pm-part2-v3-signed^0 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d29168e9af59c9db1885e27493fbed4d24ef18;p=pandora-kernel.git ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n 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 Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren --- Reading git-diff-tree failed