diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
| commit | c6c3a3a03e6de52866bc81a32fc551733625d553 (patch) | |
| tree | b55967a9163dba315e2543d648de758b82c85fa1 /arch/arm/mach-omap2/smartreflex-class3.c | |
| parent | 07e87e15b969a05a7943d7ff1abc2d8da287171c (diff) | |
| parent | 8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff) | |
Merge branch 'omap/cleanup' into next/cleanup2
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 f438cf4d847b..53d9d0a5b39d 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; } |