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-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
x86_init.h
diff --git
a/arch/x86/include/asm/x86_init.h
b/arch/x86/include/asm/x86_init.h
index aa4747569e23b63ea9cb83912bb6960caa8525cc..fc2f082ac635a1cc08ec2dbf0fe5d5cd6ee28edd 100644
(file)
--- a/
arch/x86/include/asm/x86_init.h
+++ b/
arch/x86/include/asm/x86_init.h
@@
-212,6
+212,7
@@
enum x86_legacy_i8042_state {
struct x86_legacy_features {
enum x86_legacy_i8042_state i8042;
int rtc;
+ int warm_reset;
int no_vga;
int reserve_bios_regions;
struct x86_legacy_devices devices;