diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:52:05 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:52:05 -0500 |
| commit | eae11717a184705aad08a3783cba964bfa3a06dd (patch) | |
| tree | 1eea57a2c772ec5b31389a2ef568056b48b4c75e /runtime_pm_fixups.patch | |
| parent | 72b3729657a0c46f187e4a6c500b239a0e4d391a (diff) | |
| parent | cbb00197b664276f98b22d0531c342231d4d6ae0 (diff) | |
| download | kernel-eae11717a184705aad08a3783cba964bfa3a06dd.tar.gz kernel-eae11717a184705aad08a3783cba964bfa3a06dd.tar.xz kernel-eae11717a184705aad08a3783cba964bfa3a06dd.zip | |
Merge branch 'kernel-git'
Diffstat (limited to 'runtime_pm_fixups.patch')
| -rw-r--r-- | runtime_pm_fixups.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime_pm_fixups.patch b/runtime_pm_fixups.patch index 6315dc17..78911581 100644 --- a/runtime_pm_fixups.patch +++ b/runtime_pm_fixups.patch @@ -110,5 +110,5 @@ index 4de84ce..284f43c 100644 -int acpi_disable_wakeup_device_power(struct acpi_device *dev); +int acpi_disable_wakeup_device_power(struct acpi_device *dev, int state); - #ifdef CONFIG_PM_SLEEP + #ifdef CONFIG_PM_OPS int acpi_pm_device_sleep_state(struct device *, int *); |