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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
platform-quirks.c
diff --git
a/arch/x86/kernel/platform-quirks.c
b/arch/x86/kernel/platform-quirks.c
index 39a59299bfa08ec4884065c75cd5b61cc275e72b..235fe6008ac889ae9867d916c9461ddaefaa11dd 100644
(file)
--- a/
arch/x86/kernel/platform-quirks.c
+++ b/
arch/x86/kernel/platform-quirks.c
@@
-9,6
+9,7
@@
void __init x86_early_init_platform_quirks(void)
{
x86_platform.legacy.i8042 = X86_LEGACY_I8042_EXPECTED_PRESENT;
x86_platform.legacy.rtc = 1;
+ x86_platform.legacy.warm_reset = 1;
x86_platform.legacy.reserve_bios_regions = 0;
x86_platform.legacy.devices.pnpbios = 1;