diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-16 06:04:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-16 06:04:56 +0200 |
commit | 8f10a58c6f49ed9a65b01336fc1084d150c00c08 (patch) | |
tree | acae71b201056da29c2057d65b0dd760e869c8a6 /kernel-aarch64-debug.config | |
parent | ba5ae2e5ab78b18e88c240ed92ee8a192776e5bd (diff) | |
parent | 3d93a416f2530b59aec1497d1e1daed24a5de3a7 (diff) | |
download | kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.tar.gz kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.tar.xz kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-aarch64-debug.config')
-rw-r--r-- | kernel-aarch64-debug.config | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0f0514fe3..467cffc1c 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1847,11 +1847,6 @@ CONFIG_FIREWIRE_SBP2=m # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=y CONFIG_FM10K=m -CONFIG_FMC_CHARDEV=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m CONFIG_FORCE_MAX_ZONEORDER=13 @@ -6017,7 +6012,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8960 is not set +CONFIG_SND_SOC_WM8960=m # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8978 is not set |