diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 17:10:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 17:10:27 +0200 |
| commit | a9c48eabe6f448c130bf5151f800d68e55f5fb3b (patch) | |
| tree | 446218791dee5c96c180f7a7ef5828613f844d4c /arch/arm64 | |
| parent | f50365a192c8a9cd1ba044b4a5c44c97472de3a6 (diff) | |
| parent | 0c26a3345b4f402b87d9be00df4d3054cd8ba46f (diff) | |
Merge tag 'hisi-arm64-defconfig-for-5.4' of git://github.com/hisilicon/linux-hisi into arm/defconfig
ARM64: hisilicon: defconfig updates for v5.4
- Enable ACPI_APEI_PCIEAER for the hisilicon D06 board to
support PCIe AER error report
* tag 'hisi-arm64-defconfig-for-5.4' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable CONFIG_ACPI_APEI_PCIEAER
Link: https://lore.kernel.org/r/5D562573.5030604@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c0a7cfe3aebd..93763d542f19 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -96,6 +96,7 @@ CONFIG_IMX_SCU_PD=y CONFIG_ACPI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=y CONFIG_VIRTUALIZATION=y |