diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
| commit | b740e76936c14354a9c5676a3eed839ea8472c41 (patch) | |
| tree | dd0b74f64007dba28fcf12595af893e367d307ff /drivers/acpi/device_pm.c | |
| parent | drm/atomic-helper: Simplify commit tracking locking (diff) | |
| parent | Backmerge tag 'v4.12-rc7' into drm-next (diff) | |
| download | linux-b740e76936c14354a9c5676a3eed839ea8472c41.tar.xz linux-b740e76936c14354a9c5676a3eed839ea8472c41.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Required for Daniel's drm_vblank_cleanup cleanup
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 798d5003a039..993fd31394c8 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -24,7 +24,6 @@ #include <linux/pm_qos.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> -#include <linux/suspend.h> #include "internal.h" @@ -400,7 +399,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) mutex_lock(&acpi_pm_notifier_lock); if (adev->wakeup.flags.notifier_present) { - pm_wakeup_ws_event(adev->wakeup.ws, 0, true); + __pm_wakeup_event(adev->wakeup.ws, 0); if (adev->wakeup.context.work.func) queue_pm_work(&adev->wakeup.context.work); } |