diff options
| author | Rafael J. Wysocki | 2011-10-07 23:17:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2011-10-07 23:17:07 +0200 |
| commit | 9696cc90071e3660ec02a3728acdedb68afdce4c (patch) | |
| tree | 99783d31dd42262c29346c92760f7896c3d81cb6 /drivers/cpuidle/governors/menu.c | |
| parent | Merge branch 'pm-domains' into pm-for-linus (diff) | |
| parent | PM / QoS: Update Documentation for the pm_qos and dev_pm_qos frameworks (diff) | |
| download | kernel-qcow2-linux-9696cc90071e3660ec02a3728acdedb68afdce4c.tar.gz kernel-qcow2-linux-9696cc90071e3660ec02a3728acdedb68afdce4c.tar.xz kernel-qcow2-linux-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 'drivers/cpuidle/governors/menu.c')
| -rw-r--r-- | drivers/cpuidle/governors/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index c47f3d09c1ee..3600f1955e48 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/cpuidle.h> -#include <linux/pm_qos_params.h> +#include <linux/pm_qos.h> #include <linux/time.h> #include <linux/ktime.h> #include <linux/hrtimer.h> |