projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
drivers
/
acpi
/
sleep.c
diff --git
a/drivers/acpi/sleep.c
b/drivers/acpi/sleep.c
index fbfcce3b5227e0c4ea90e5838f8762582978ae99..2a8b5964429753b212a0f28ff9be5f19a7a1b777 100644
(file)
--- a/
drivers/acpi/sleep.c
+++ b/
drivers/acpi/sleep.c
@@
-748,6
+748,7
@@
static int acpi_hibernation_enter(void)
static void acpi_hibernation_leave(void)
{
+ pm_set_resume_via_firmware();
/*
* If ACPI is not enabled by the BIOS and the boot kernel, we need to
* enable it here.
This page took
0.028282 seconds
and
5
git commands to generate.