diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-16 01:30:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-16 01:30:46 +0200 |
| commit | 592a55d83599d6b3c90acc7a3795fb3ff1851be7 (patch) | |
| tree | 575537b6b0c8571219b38754b9a76305a3c3952a /include | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| parent | efca406b940e93e6af38c597eecd5fb79b39b7ea (diff) | |
Merge tag 'omap-pm-v3.11/avs' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-omap
Pull PM / AVS: SmartReflex: misc. cleanups for 3.11 from Kevin Hilman.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/power/smartreflex.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h index c0f44c2b006d..d8b187c3925d 100644 --- a/include/linux/power/smartreflex.h +++ b/include/linux/power/smartreflex.h @@ -299,11 +299,11 @@ void omap_sr_disable_reset_volt(struct voltagedomain *voltdm); void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data); /* Smartreflex driver hooks to be called from Smartreflex class driver */ -int sr_enable(struct voltagedomain *voltdm, unsigned long volt); -void sr_disable(struct voltagedomain *voltdm); -int sr_configure_errgen(struct voltagedomain *voltdm); -int sr_disable_errgen(struct voltagedomain *voltdm); -int sr_configure_minmax(struct voltagedomain *voltdm); +int sr_enable(struct omap_sr *sr, unsigned long volt); +void sr_disable(struct omap_sr *sr); +int sr_configure_errgen(struct omap_sr *sr); +int sr_disable_errgen(struct omap_sr *sr); +int sr_configure_minmax(struct omap_sr *sr); /* API to register the smartreflex class driver with the smartreflex driver */ int sr_register_class(struct omap_sr_class_data *class_data); |