diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /kernel/power/qos.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'kernel/power/qos.c')
| -rw-r--r-- | kernel/power/qos.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 56db75147186..995e3bd3417b 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c | |||
| @@ -70,6 +70,7 @@ static struct pm_qos_constraints cpu_dma_constraints = { | |||
| 70 | }; | 70 | }; |
| 71 | static struct pm_qos_object cpu_dma_pm_qos = { | 71 | static struct pm_qos_object cpu_dma_pm_qos = { |
| 72 | .constraints = &cpu_dma_constraints, | 72 | .constraints = &cpu_dma_constraints, |
| 73 | .name = "cpu_dma_latency", | ||
| 73 | }; | 74 | }; |
| 74 | 75 | ||
| 75 | static BLOCKING_NOTIFIER_HEAD(network_lat_notifier); | 76 | static BLOCKING_NOTIFIER_HEAD(network_lat_notifier); |