summaryrefslogtreecommitdiffstats
path: root/kernel-i686-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-i686-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-i686-fedora.config')
-rw-r--r--kernel-i686-fedora.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 8601ec2f9..f3841217b 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -73,7 +73,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_SLEEP=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_TOSHIBA=m
@@ -3603,7 +3603,7 @@ CONFIG_MTD_NAND_CAFE=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