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/vc.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/vc.c')
| -rw-r--r-- | arch/arm/mach-omap2/vc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 687aa86c0d5e..a89ec8affed4 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -666,6 +666,7 @@ static u8 omap_vc_calc_vsel(struct voltagedomain *voltdm, u32 uvolt) return voltdm->pmic->uv_to_vsel(uvolt); } +#ifdef CONFIG_PM /** * omap_pm_setup_sr_i2c_pcb_length - set length of SR I2C traces on PCB * @mm: length of the PCB trace in millimetres @@ -678,6 +679,7 @@ void __init omap_pm_setup_sr_i2c_pcb_length(u32 mm) { sr_i2c_pcb_length = mm; } +#endif void __init omap_vc_init_channel(struct voltagedomain *voltdm) { |