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-i686-debug.config | |
| parent | ed02a9d2d096f6a098d7ce34d9dc802ed2a5e01a (diff) | |
| parent | b385dc200562634fa6c74afe06593138aeefaf59 (diff) | |
| download | kernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc29.tar.gz kernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc29.tar.xz kernel-4.20.0-0.rc5.git0.1.vanilla.knurd.1.fc29.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-i686-debug.config')
| -rw-r--r-- | kernel-i686-debug.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d62f0c8e2..cb9403d42 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2528,7 +2528,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 @@ -4290,6 +4289,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y # CONFIG_PROVIDE_OHCI1394_DMA_INIT 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 @@ -5323,6 +5323,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 |