diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
| commit | 72b3729657a0c46f187e4a6c500b239a0e4d391a (patch) | |
| tree | 47c746511fa3f4ef828d70bc2011f71d2cec86f1 /runtime_pm_fixups.patch | |
| parent | 738764956426a09304f07623f75f711a013ef55a (diff) | |
| download | kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.gz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.xz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.zip | |
Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing
changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.
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 78911581..6315dc17 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_OPS + #ifdef CONFIG_PM_SLEEP int acpi_pm_device_sleep_state(struct device *, int *); |