diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
| commit | 23618f7faa8fdac93d4823d0372f4101d642b8b1 (patch) | |
| tree | 9cdc7fb633ec7c0f24eee93a968bb799f45608e2 /arch/arm/mach-omap2/smartreflex-class3.c | |
| parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
| parent | ee7fbba63e334481049a7939b8071160824447d3 (diff) | |
Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex-class3.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex-class3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/smartreflex-class3.c b/arch/arm/mach-omap2/smartreflex-class3.c index f438cf4d847..53d9d0a5b39 100644 --- a/arch/arm/mach-omap2/smartreflex-class3.c +++ b/arch/arm/mach-omap2/smartreflex-class3.c @@ -15,7 +15,7 @@ static int sr_class3_enable(struct voltagedomain *voltdm) { - unsigned long volt = omap_voltage_get_nom_volt(voltdm); + unsigned long volt = voltdm_get_voltage(voltdm); if (!volt) { pr_warning("%s: Curr voltage unknown. Cannot enable sr_%s\n", @@ -32,7 +32,7 @@ static int sr_class3_disable(struct voltagedomain *voltdm, int is_volt_reset) omap_vp_disable(voltdm); sr_disable(voltdm); if (is_volt_reset) - omap_voltage_reset(voltdm); + voltdm_reset(voltdm); return 0; } |