diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:17:07 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:17:07 +0200 |
commit | 9696cc90071e3660ec02a3728acdedb68afdce4c (patch) | |
tree | 99783d31dd42262c29346c92760f7896c3d81cb6 /sound/core | |
parent | c28b56b1d46b1bbb1be33c8f2632a88b0de1ef68 (diff) | |
parent | e3cba3243eb853a052613c804dea033bc4c9cf2d (diff) | |
download | linux-3.10-9696cc90071e3660ec02a3728acdedb68afdce4c.tar.gz linux-3.10-9696cc90071e3660ec02a3728acdedb68afdce4c.tar.bz2 linux-3.10-9696cc90071e3660ec02a3728acdedb68afdce4c.zip |
Merge branch 'pm-qos' into pm-for-linus
* pm-qos:
PM / QoS: Update Documentation for the pm_qos and dev_pm_qos frameworks
PM / QoS: Add function dev_pm_qos_read_value() (v3)
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/core')
-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 1c6be91dfb9..c74e228731e 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> |