summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-22 10:44:33 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-22 10:44:33 +0100
commit5cd30c863d90edd84960d5280e4ed613e5e2b57d (patch)
tree4fdf523b19fbcca676d577731a6076ef244f069a /kernel-s390x-debug-fedora.config
parent5fdc5912aa02220b59a88253914f610aff091bbb (diff)
parentb5ca9bd2a0d74a61884af672bac39496ac01971e (diff)
downloadkernel-5cd30c863d90edd84960d5280e4ed613e5e2b57d.tar.gz
kernel-5cd30c863d90edd84960d5280e4ed613e5e2b57d.tar.xz
kernel-5cd30c863d90edd84960d5280e4ed613e5e2b57d.zip
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 045af30c6..c3732ad47 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
# CONFIG_ACPI_NFIT is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
@@ -3302,7 +3302,7 @@ CONFIG_MTD_NAND_CADENCE=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