diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-11-15 02:13:04 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-15 02:21:15 +0100 |
| commit | 74d29168e9af59c9db1885e27493fbed4d24ef18 (patch) | |
| tree | bf390fdd6b3cc2ff63d00bee24ef5adf9960a136 /arch/arm/mach-omap2/pm.c | |
| parent | Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2 (diff) | |
| download | linux-74d29168e9af59c9db1885e27493fbed4d24ef18.tar.xz linux-74d29168e9af59c9db1885e27493fbed4d24ef18.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 109a02e02d72..ef668c756db7 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -39,6 +39,7 @@ static struct omap_device_pm_latency *pm_lats; */ int (*omap_pm_suspend)(void); +#ifdef CONFIG_PM /** * struct omap2_oscillator - Describe the board main oscillator latencies * @startup_time: oscillator startup latency @@ -68,6 +69,7 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) *tstart = oscillator.startup_time; *tshut = oscillator.shutdown_time; } +#endif static int __init _init_omap_device(char *name) { |