summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-20 13:37:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-20 13:37:44 -0800
commit5d6a54688632f640abda71164fea5d171ff07db8 (patch)
treed2cc44629a86745a82d3d3552aec45ada17bcb78 /include
parent787140ad6bb49422e2f114e9b8df18b242df00db (diff)
parent464ed18ebdb6236fcff59d2a35d4d2e28668435a (diff)
downloadlinux-5d6a54688632f640abda71164fea5d171ff07db8.tar.gz
linux-5d6a54688632f640abda71164fea5d171ff07db8.tar.bz2
linux-5d6a54688632f640abda71164fea5d171ff07db8.zip
Merge tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull CONFIG_PM_RUNTIME elimination from Rafael Wysocki: "This removes the last few uses of CONFIG_PM_RUNTIME introduced recently and makes that config option finally go away. CONFIG_PM will be available directly from the menu now and also it will be selected automatically if CONFIG_SUSPEND or CONFIG_HIBERNATION is set" * tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: Eliminate CONFIG_PM_RUNTIME tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Diffstat (limited to 'include')
-rw-r--r--include/linux/devfreq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index f1863dcd83ea..ce447f0f1bad 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -188,7 +188,7 @@ extern struct devfreq *devm_devfreq_add_device(struct device *dev,
extern void devm_devfreq_remove_device(struct device *dev,
struct devfreq *devfreq);
-/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
+/* Supposed to be called by PM callbacks */
extern int devfreq_suspend_device(struct devfreq *devfreq);
extern int devfreq_resume_device(struct devfreq *devfreq);