diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-26 16:49:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-26 16:49:57 +0200 |
commit | 6df1357e8570ace5c08ba2611e5f991fcc762861 (patch) | |
tree | 0580ef970c59301b3928f305c07e3f4809eca7c3 /kernel-i686-fedora.config | |
parent | f8b41dfa36d429d7bc87436133882c83af37fbff (diff) | |
parent | ad07f83694b013ca55842016af04b1fb22d34270 (diff) | |
download | kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.tar.gz kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.tar.xz kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc3.29.vanilla.1.fc35kernel-5.14.0-0.rc3.29.vanilla.1.fc34kernel-5.14.0-0.rc3.29.vanilla.1.fc33
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 1a2483fad..f2bae571b 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1805,7 +1805,7 @@ CONFIG_FB_GEODE_GX=y CONFIG_FB_GEODE_LX=y CONFIG_FB_GEODE=y # CONFIG_FB_HGA is not set -CONFIG_FB_HYPERV=m +# CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set CONFIG_FB_I810_GTF=y CONFIG_FB_I810_I2C=y @@ -3450,6 +3450,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_ACT8945A is not set # CONFIG_MFD_ARIZONA_I2C is not set # CONFIG_MFD_ARIZONA_SPI is not set +CONFIG_MFD_ARIZONA=y # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_AS3722 is not set # CONFIG_MFD_ASIC3 is not set @@ -3555,6 +3556,7 @@ CONFIG_MFD_VIPERBOARD=m CONFIG_MFD_VX855=m # CONFIG_MFD_WCD934X is not set CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_WM5102=y # CONFIG_MFD_WM831X_I2C is not set # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set @@ -6085,6 +6087,7 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m CONFIG_SND_SOC_INTEL_CATPT=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m @@ -6226,6 +6229,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m |