summaryrefslogtreecommitdiffstats
path: root/include/linux/pm.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 /include/linux/pm.h
parented819e3b964bba8bfae8e65d4d55a3f345f8da16 (diff)
parentefe6a8ad7fc55b350ce968cae4c757d35e986285 (diff)
downloadlinux-stable-59fb53ea75eef4aa029cf31c88cdacec2f7b794b.tar.gz
linux-stable-59fb53ea75eef4aa029cf31c88cdacec2f7b794b.tar.bz2
linux-stable-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 'include/linux/pm.h')
-rw-r--r--include/linux/pm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index d6dd6f612b8d..715305e05123 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -546,6 +546,7 @@ struct dev_pm_info {
unsigned long accounting_timestamp;
ktime_t suspend_time;
s64 max_time_suspended_ns;
+ struct dev_pm_qos_request *pq_req;
#endif
struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */
struct pm_qos_constraints *constraints;