summaryrefslogtreecommitdiffstats
path: root/drivers/base/power/power.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-03-16 21:49:24 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-16 21:49:24 +0100
commit59fb53ea75eef4aa029cf31c88cdacec2f7b794b (patch)
treefb2ee7f8e99a72fe858e76ba7f2dbbc0390f3128 /drivers/base/power/power.h
parentMerge branch 'pm-qos' (diff)
parentsh_mmcif / PM: Use PM QoS latency constraint (diff)
downloadlinux-59fb53ea75eef4aa029cf31c88cdacec2f7b794b.tar.xz
linux-59fb53ea75eef4aa029cf31c88cdacec2f7b794b.zip
Merge branch 'pm-qos'
* pm-qos: sh_mmcif / PM: Use PM QoS latency constraint tmio_mmc / PM: Use PM QoS latency constraint PM / QoS: Make it possible to expose PM QoS latency constraints
Diffstat (limited to 'drivers/base/power/power.h')
-rw-r--r--drivers/base/power/power.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 9bf62323aaf3..eeb4bff9505c 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -71,6 +71,8 @@ extern void dpm_sysfs_remove(struct device *dev);
extern void rpm_sysfs_remove(struct device *dev);
extern int wakeup_sysfs_add(struct device *dev);
extern void wakeup_sysfs_remove(struct device *dev);
+extern int pm_qos_sysfs_add(struct device *dev);
+extern void pm_qos_sysfs_remove(struct device *dev);
#else /* CONFIG_PM */
@@ -79,5 +81,7 @@ static inline void dpm_sysfs_remove(struct device *dev) {}
static inline void rpm_sysfs_remove(struct device *dev) {}
static inline int wakeup_sysfs_add(struct device *dev) { return 0; }
static inline void wakeup_sysfs_remove(struct device *dev) {}
+static inline int pm_qos_sysfs_add(struct device *dev) { return 0; }
+static inline void pm_qos_sysfs_remove(struct device *dev) {}
#endif