diff --git a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
deleted file mode 100644
index e109ab25a..000000000
--- a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b1aa5358f..3700e4c4a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5676,7 +5676,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 0dfb2f643..95927c991 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5653,7 +5653,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 319083f92..cbab408fe 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6016,7 +6016,6 @@ 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 4a4072856..613ab32f8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5670,7 +5670,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 b6f491343..300edada0 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5648,7 +5648,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 6356fb84a..b0d4ac78e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5994,7 +5994,6 @@ 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-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f4fcec154..44124180a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5056,7 +5056,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 d4a7c8633..80a02d4d5 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5032,7 +5032,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 38bc24f3a..99926a907 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4951,7 +4951,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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 b0d0fbc99..1f1c8bd1d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4927,7 +4927,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # 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