projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-wdat' and 'acpi-ec'
[cascardo/linux.git]
/
drivers
/
acpi
/
Kconfig
diff --git
a/drivers/acpi/Kconfig
b/drivers/acpi/Kconfig
index
c6bb6aa
..
696c6f7
100644
(file)
--- a/
drivers/acpi/Kconfig
+++ b/
drivers/acpi/Kconfig
@@
-461,6
+461,9
@@
source "drivers/acpi/nfit/Kconfig"
source "drivers/acpi/apei/Kconfig"
source "drivers/acpi/dptf/Kconfig"
+config ACPI_WATCHDOG
+ bool
+
config ACPI_EXTLOG
tristate "Extended Error Log support"
depends on X86_MCE && X86_LOCAL_APIC