Merge branch 'linus' into release

[pandora-kernel.git] / drivers / acpi / apei / Kconfig

diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index e91680c..66a03ca 100644 (file)
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -22,6 +22,13 @@ config ACPI_APEI_GHES
          by firmware to produce more valuable hardware error
          information for Linux.
 
+config ACPI_APEI_PCIEAER
+       bool "APEI PCIe AER logging/recovering support"
+       depends on ACPI_APEI && PCIEAER
+       help
+         PCIe AER errors may be reported via APEI firmware first mode.
+         Turn on this option to enable the corresponding support.
+
 config ACPI_APEI_EINJ
        tristate "APEI Error INJection (EINJ)"
        depends on ACPI_APEI && DEBUG_FS