git.baikalelectronics.ru Git - kernel.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	be6cdc2ec3179d4c3a8d0f5e86cba6531c9c16e3
tree	bf390fdd6b3cc2ff63d00bee24ef5adf9960a136	tree \| snapshot
parent	5e77fe87ca70987f065194bf45aedf4371a24d00	commit \| diff

ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n

commit 3e250bd4 (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