diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-19 17:58:30 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-19 17:58:30 +0100 |
| commit | d17259e62379cc156675b9cf903e6cfdf677a27e (patch) | |
| tree | cc421f6adc609d4abc465b24b0dfec7d46513c3c /kernel-i686-fedora.config | |
| parent | 28e02b230b1d8d1d2c244ddaf8aa1fca7ffa49a5 (diff) | |
| parent | 9a733b7fc936752211d28f5c0fca84ddd7aa7da4 (diff) | |
| download | kernel-d17259e62379cc156675b9cf903e6cfdf677a27e.tar.gz kernel-d17259e62379cc156675b9cf903e6cfdf677a27e.tar.xz kernel-d17259e62379cc156675b9cf903e6cfdf677a27e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.vanilla.1.fc34kernel-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.vanilla.1.fc33kernel-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.vanilla.1.fc32kernel-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.vanilla.1.fc31
Diffstat (limited to 'kernel-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 4aabb9099..ea7194242 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 @@ -3656,7 +3656,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 |