Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

author	Kevin Hilman <khilman@ti.com>
	Thu, 15 Nov 2012 01:13:04 +0000 (17:13 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 15 Nov 2012 01:21:15 +0000 (17:21 -0800)
commit	74d29168e9af59c9db1885e27493fbed4d24ef18
tree	bf390fdd6b3cc2ff63d00bee24ef5adf9960a136	tree \| snapshot
parent	6515b0f75af68ad5e36f5297bb6b9a5ba3e710d2	commit \| diff

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 <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/pm.c		diff \| blob \| history
arch/arm/mach-omap2/pm.h		diff \| blob \| history
arch/arm/mach-omap2/vc.c		diff \| blob \| history