diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-25 15:39:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-25 15:39:00 +0200 |
| commit | 97200faca5a1567778b9fd983f76877556a7f032 (patch) | |
| tree | efd0147881db7155a1f0ada8e4875b8008b784d6 /sound | |
| parent | 1d75e3c2699505008a26d761885545478435f8b8 (diff) | |
| parent | b66213cdb002b08b29603d488c451dfe25e2ca20 (diff) | |
Merge branch 'pm-qos' into linux-next
* pm-qos:
PM QoS: Add global notification mechanism for device constraints
PM QoS: Implement per-device PM QoS constraints
PM QoS: Generalize and export constraints management code
PM QoS: Reorganize data structs
PM QoS: Code reorganization
PM QoS: Minor clean-ups
PM QoS: Move and rename the implementation files
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 1c6be91dfb98..c74e228731ed 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -23,7 +23,7 @@ #include <linux/file.h> #include <linux/slab.h> #include <linux/time.h> -#include <linux/pm_qos_params.h> +#include <linux/pm_qos.h> #include <linux/uio.h> #include <linux/dma-mapping.h> #include <sound/core.h> |