summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_SND_INTEL8X02
-rw-r--r--baseconfig/CONFIG_SND_INTEL8X0M2
-rw-r--r--baseconfig/CONFIG_SND_VIA82XX2
-rw-r--r--baseconfig/CONFIG_SND_VIA82XX_MODEM2
-rw-r--r--baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX778021
-rw-r--r--baseconfig/x86/CONFIG_SND_INTEL8X01
-rw-r--r--baseconfig/x86/CONFIG_SND_INTEL8X0M1
-rw-r--r--baseconfig/x86/CONFIG_SND_VIA82XX1
-rw-r--r--baseconfig/x86/CONFIG_SND_VIA82XX_MODEM1
-rw-r--r--kernel-aarch64-debug.config8
-rw-r--r--kernel-aarch64.config8
-rw-r--r--kernel-armv7hl-debug.config9
-rw-r--r--kernel-armv7hl-lpae-debug.config9
-rw-r--r--kernel-armv7hl-lpae.config9
-rw-r--r--kernel-armv7hl.config9
-rw-r--r--kernel-ppc64-debug.config8
-rw-r--r--kernel-ppc64.config8
-rw-r--r--kernel-ppc64le-debug.config8
-rw-r--r--kernel-ppc64le.config8
-rw-r--r--kernel-ppc64p7-debug.config8
-rw-r--r--kernel-ppc64p7.config8
-rw-r--r--kernel-s390x-debug.config8
-rw-r--r--kernel-s390x.config8
23 files changed, 64 insertions, 65 deletions
diff --git a/baseconfig/CONFIG_SND_INTEL8X0 b/baseconfig/CONFIG_SND_INTEL8X0
index 6d78f08ea..d97191a98 100644
--- a/baseconfig/CONFIG_SND_INTEL8X0
+++ b/baseconfig/CONFIG_SND_INTEL8X0
@@ -1 +1 @@
-CONFIG_SND_INTEL8X0=m
+# CONFIG_SND_INTEL8X0 is not set
diff --git a/baseconfig/CONFIG_SND_INTEL8X0M b/baseconfig/CONFIG_SND_INTEL8X0M
index 24ac6ada4..4e04bb51c 100644
--- a/baseconfig/CONFIG_SND_INTEL8X0M
+++ b/baseconfig/CONFIG_SND_INTEL8X0M
@@ -1 +1 @@
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0M is not set
diff --git a/baseconfig/CONFIG_SND_VIA82XX b/baseconfig/CONFIG_SND_VIA82XX
index 129cf3976..2c2673578 100644
--- a/baseconfig/CONFIG_SND_VIA82XX
+++ b/baseconfig/CONFIG_SND_VIA82XX
@@ -1 +1 @@
-CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VIA82XX is not set
diff --git a/baseconfig/CONFIG_SND_VIA82XX_MODEM b/baseconfig/CONFIG_SND_VIA82XX_MODEM
index 81e80f3a5..53055c694 100644
--- a/baseconfig/CONFIG_SND_VIA82XX_MODEM
+++ b/baseconfig/CONFIG_SND_VIA82XX_MODEM
@@ -1 +1 @@
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX_MODEM is not set
diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802 b/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802
deleted file mode 100644
index c6e1136d0..000000000
--- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_MAX77802=m
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0 b/baseconfig/x86/CONFIG_SND_INTEL8X0
new file mode 100644
index 000000000..6d78f08ea
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_INTEL8X0
@@ -0,0 +1 @@
+CONFIG_SND_INTEL8X0=m
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0M b/baseconfig/x86/CONFIG_SND_INTEL8X0M
new file mode 100644
index 000000000..24ac6ada4
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_INTEL8X0M
@@ -0,0 +1 @@
+CONFIG_SND_INTEL8X0M=m
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX b/baseconfig/x86/CONFIG_SND_VIA82XX
new file mode 100644
index 000000000..129cf3976
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_VIA82XX
@@ -0,0 +1 @@
+CONFIG_SND_VIA82XX=m
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM b/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM
new file mode 100644
index 000000000..81e80f3a5
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM
@@ -0,0 +1 @@
+CONFIG_SND_VIA82XX_MODEM=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 96072ef5d..57313bb64 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5125,8 +5125,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set
@@ -5332,8 +5332,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index be699cd6a..719afb8a2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5103,8 +5103,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set
@@ -5309,8 +5309,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 283c4faf0..9defeffb3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -924,7 +924,6 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX77802=m
CONFIG_COMMON_CLK_PALMAS=m
CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=y
@@ -5518,8 +5517,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -5773,8 +5772,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index acf36d92c..ab637cfce 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -896,7 +896,6 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX77802=m
CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
@@ -5193,8 +5192,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -5414,8 +5413,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fcf845c2b..64a7a5637 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -895,7 +895,6 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX77802=m
CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
@@ -5171,8 +5170,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -5391,8 +5390,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 992bb6ec6..da264bb89 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -923,7 +923,6 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
CONFIG_COMMON_CLK_MAX77686=m
-CONFIG_COMMON_CLK_MAX77802=m
CONFIG_COMMON_CLK_PALMAS=m
CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=y
@@ -5496,8 +5495,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -5750,8 +5749,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index eb676b81f..d9e712e07 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4684,8 +4684,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4863,8 +4863,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 15cb32900..972270eb7 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4661,8 +4661,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4839,8 +4839,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 87e3b4eff..80e07b105 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4615,8 +4615,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4792,8 +4792,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index f7a84c72b..08b0b007e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4592,8 +4592,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4768,8 +4768,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index aafc6c898..36b80d014 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4614,8 +4614,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4791,8 +4791,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index bf6b9b5af..ff51d708e 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4591,8 +4591,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4767,8 +4767,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6a74dcd06..5a2361279 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4512,8 +4512,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4688,8 +4688,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 9026bca5c..6c743f228 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4489,8 +4489,8 @@ CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
@@ -4664,8 +4664,8 @@ CONFIG_SND_USB_VARIAX=m
CONFIG_SND_USB=y
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m