git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PM: suspend: Rename pm_suspend_via_s2idle()
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
serio
/
i8042.c
diff --git
a/drivers/input/serio/i8042.c
b/drivers/input/serio/i8042.c
index 6462f1798fbb5ab5976e45071b085eb007d805ad..8384abc41d7f042f7f13bd8feaeeca8607824e17 100644
(file)
--- a/
drivers/input/serio/i8042.c
+++ b/
drivers/input/serio/i8042.c
@@
-1410,7
+1410,7
@@
static void __init i8042_register_ports(void)
* behavior on many platforms using suspend-to-RAM (ACPI S3)
* by default.
*/
- if (pm_suspend_
via
_s2idle() && i == I8042_KBD_PORT_NO)
+ if (pm_suspend_
default
_s2idle() && i == I8042_KBD_PORT_NO)
device_set_wakeup_enable(&serio->dev, true);
}
}