diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
commit | e7f67bfda8b9f7d72ccb37086a7686f625f7db9c (patch) | |
tree | 210ae97882f5edadb3b71ea3473ea3cb4a0455cb /kernel-x86_64-fedora.config | |
parent | 95325f68cbc232e30137829afdbe69770f410ec2 (diff) | |
parent | b4aa7140f3d9ab3f0910055d3f8f805ae1326906 (diff) | |
download | kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.gz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.xz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc3.20220420git559089e0a93d442.29.vanilla.1.fc36
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 53d4fd59b..d1087faf1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3540,8 +3540,9 @@ CONFIG_MFD_ENE_KB3930=m # CONFIG_MFD_GATEWORKS_GSC is not set # CONFIG_MFD_HI6421_PMIC is not set # CONFIG_MFD_HI6421_SPMI is not set -CONFIG_MFD_INTEL_LPSS_ACPI=y -CONFIG_MFD_INTEL_LPSS_PCI=y +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_M10_BMC=m CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set @@ -5004,7 +5005,6 @@ CONFIG_PWM_DWC=m # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_HIBVT=m # CONFIG_PWM_INTEL_LGM is not set -CONFIG_PWM_LPSS=m CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set @@ -5437,8 +5437,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -5867,7 +5866,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=32 |