diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:40 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:40 +0400 |
| commit | e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb (patch) | |
| tree | 1729332ebab51bb560ca64effe46cdab38ab537f /drivers/acpi | |
| parent | 405a1086bdd091d2d55db0ac905cd6332b35cec1 (diff) | |
| parent | f5ce1572109049b90484e2bb44927cb6034c5eb1 (diff) | |
| download | linux-e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb.tar.xz | |
Merge branch 'pm-assorted'
* pm-assorted:
PM / QoS: Add pm_qos and dev_pm_qos to events-power.txt
PM / QoS: Add dev_pm_qos_request tracepoints
PM / QoS: Add pm_qos_request tracepoints
PM / QoS: Add pm_qos_update_target/flags tracepoints
PM / QoS: Update Documentation/power/pm_qos_interface.txt
PM / Sleep: Print last wakeup source on failed wakeup_count write
PM / QoS: correct the valid range of pm_qos_class
PM / wakeup: Adjust messaging for wake events during suspend
PM / Runtime: Update .runtime_idle() callback documentation
PM / Runtime: Rework the "runtime idle" helper routine
PM / Hibernate: print physical addresses consistently with other parts of kernel
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/device_pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 5f3597b87f27..67624d4d5aef 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -933,7 +933,6 @@ static struct dev_pm_domain acpi_general_pm_domain = { #ifdef CONFIG_PM_RUNTIME .runtime_suspend = acpi_subsys_runtime_suspend, .runtime_resume = acpi_subsys_runtime_resume, - .runtime_idle = pm_generic_runtime_idle, #endif #ifdef CONFIG_PM_SLEEP .prepare = acpi_subsys_prepare, |