aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 07:01:13 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 07:01:13 -0400
commitceaed1e3942132a0705ef5b4e1d696313d638550 (patch)
tree8043d7e02b3b5eb73a95d27f0bee50278a099a52 /include/linux
parent93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4 (diff)
parenta02a0cfd568bc882e6707a8869e4298b122a347f (diff)
Merge branch 'pm-devfreq'
* pm-devfreq: MAINTAINERS: update mailing list for devfreq(DVFS). PM / devfreq: fix typo "CPU_EXYNOS4.12" twice PM / devfreq: fix missing unlock on error in exynos4_busfreq_pm_notifier_event() PM / devfreq: add comments and Documentation PM / devfreq: account suspend/resume for stats PM / devfreq: Add Exynos5-bus devfreq driver for Exynos5250 PM / devfreq: Move exynos4 devfreq driver into a new sub-directory
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/devfreq.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index fe8c4476f7e4..5f1ab92107e6 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -181,6 +181,8 @@ extern struct devfreq *devfreq_add_device(struct device *dev,
181 const char *governor_name, 181 const char *governor_name,
182 void *data); 182 void *data);
183extern int devfreq_remove_device(struct devfreq *devfreq); 183extern int devfreq_remove_device(struct devfreq *devfreq);
184
185/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
184extern int devfreq_suspend_device(struct devfreq *devfreq); 186extern int devfreq_suspend_device(struct devfreq *devfreq);
185extern int devfreq_resume_device(struct devfreq *devfreq); 187extern int devfreq_resume_device(struct devfreq *devfreq);
186 188