minor config cleanups

18 files changed, 26 insertions, 25 deletions

diff --git a/configs/fedora/generic/CONFIG_IR_IMG b/configs/fedora/generic/CONFIG_IR_IMG
deleted file mode 100644
index 392034a18..000000000
--- a/configs/fedora/generic/CONFIG_IR_IMG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IR_IMG is not set
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA b/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA
new file mode 100644
index 000000000..b5009c40d
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA
@@ -0,0 +1 @@
+CONFIG_SND_SOC_HDAC_HDA=m
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
new file mode 100644
index 000000000..e109ab25a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
diff --git a/configs/fedora/generic/CONFIG_SND_PCSP b/configs/fedora/generic/x86/CONFIG_SND_PCSP
index 271f411cc..271f411cc 100644
--- a/configs/fedora/generic/CONFIG_SND_PCSP
+++ b/configs/fedora/generic/x86/CONFIG_SND_PCSP
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3cb056fba..40cc994dd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2657,7 +2657,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
@@ -5599,7 +5598,6 @@ CONFIG_SND_PCI=y
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
-CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_RIPTIDE=m
@@ -5669,12 +5667,14 @@ 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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a26ed74fa..e259613bf 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2640,7 +2640,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
@@ -5576,7 +5575,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
@@ -5646,12 +5644,14 @@ 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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index da015a4af..350c47bc0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2784,7 +2784,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
@@ -5923,7 +5922,6 @@ CONFIG_SND_PCI=y
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
-CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_PXA910_SOC=m
@@ -6003,6 +6001,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 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_I2C_AND_SPI=m
@@ -6016,6 +6015,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 0be7f93ca..df25b876d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2655,7 +2655,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
@@ -5591,7 +5590,6 @@ CONFIG_SND_PCI=y
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
-CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_RIPTIDE=m
@@ -5664,12 +5662,14 @@ 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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 43fcb7d8b..2f6851f35 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
@@ -5569,7 +5568,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,12 +5640,14 @@ 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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index dea404d2a..955ab0ef8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2768,7 +2768,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
@@ -5901,7 +5900,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_PXA910_SOC=m
@@ -5981,6 +5979,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 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_I2C_AND_SPI=m
@@ -5994,6 +5993,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d62f0c8e2..2bb47f1ef 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
@@ -5323,6 +5322,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
diff --git a/kernel-i686.config b/kernel-i686.config
index 779de80f9..677b3797d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2510,7 +2510,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
@@ -5301,6 +5300,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
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index efa16f89c..dacbfb3e0 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2314,7 +2314,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
@@ -4983,7 +4982,6 @@ CONFIG_SND_PCI=y
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
-CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_PPC=y
@@ -5050,12 +5048,14 @@ CONFIG_SND_SOC_ES7134=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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 # CONFIG_SND_SOC is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 845d49b48..960d1b2af 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2296,7 +2296,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
@@ -4959,7 +4958,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_PPC=y
@@ -5026,12 +5024,14 @@ CONFIG_SND_SOC_ES7134=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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 # CONFIG_SND_SOC is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 0e40b4a29..d9f1f07e3 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2265,7 +2265,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
@@ -4879,7 +4878,6 @@ CONFIG_SND_PCI=y
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
-CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_RIPTIDE=m
@@ -4945,12 +4943,14 @@ CONFIG_SND_SOC_ES7134=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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index aa6d4011f..b5f547050 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2247,7 +2247,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
@@ -4855,7 +4854,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
@@ -4921,12 +4919,14 @@ CONFIG_SND_SOC_ES7134=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
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 6f1034377..6f5da3409 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2580,7 +2580,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
@@ -5366,6 +5365,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
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5dd8d004c..ba227ef3f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2562,7 +2562,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
@@ -5344,6 +5343,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