diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-04 06:00:15 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-04 06:00:15 +0100 |
commit | d1200b9aa0258152d39b452dbdb54bad7a87525b (patch) | |
tree | 96ae4f4865b7a57f0254ce6b9154b1b6a0c70a68 /kernel-armv7hl-lpae.config | |
parent | ed02a9d2d096f6a098d7ce34d9dc802ed2a5e01a (diff) | |
parent | b385dc200562634fa6c74afe06593138aeefaf59 (diff) | |
download | kernel-d1200b9aa0258152d39b452dbdb54bad7a87525b.tar.gz kernel-d1200b9aa0258152d39b452dbdb54bad7a87525b.tar.xz kernel-d1200b9aa0258152d39b452dbdb54bad7a87525b.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc30kernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-armv7hl-lpae.config')
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 43fcb7d8b..300edada0 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2639,7 +2639,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -4508,6 +4507,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y @@ -5569,7 +5569,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -5642,6 +5641,7 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set |