summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-22 10:44:35 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-22 10:44:35 +0100
commit238c280964e8058d6ea07d30276308fff167184b (patch)
tree80a00f219e6bb9b868af6bad880dbdbf4a98dc3b /kernel-aarch64-fedora.config
parentefa06ab6b0b107078d408684ae58e5142bd7b913 (diff)
parent674c8a3857ba03f50e96132e338cf382a6ab2fae (diff)
downloadkernel-238c280964e8058d6ea07d30276308fff167184b.tar.gz
kernel-238c280964e8058d6ea07d30276308fff167184b.tar.xz
kernel-238c280964e8058d6ea07d30276308fff167184b.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-aarch64-fedora.config')
-rw-r--r--kernel-aarch64-fedora.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d855ee119..ab032abca 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -69,7 +69,7 @@ CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_WATCHDOG=y
@@ -3922,7 +3922,7 @@ CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_NAND_QCOM is not set