minor cleanup, drop some old options

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 a99b29f19..09e1ffe2f 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5051,8 +5051,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
@@ -5254,8 +5254,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 91b1e815d..c8d151401 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5029,8 +5029,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
@@ -5231,8 +5231,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 b528fe0e6..92a889299 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -918,7 +918,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
@@ -5445,8 +5444,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
@@ -5696,8 +5695,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 f591c19fd..1ff6960b8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -891,7 +891,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
@@ -5124,8 +5123,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
@@ -5341,8 +5340,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 c114cddd7..914a8f803 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -890,7 +890,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
@@ -5102,8 +5101,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
@@ -5318,8 +5317,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 79348b2a7..038629faf 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -917,7 +917,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
@@ -5423,8 +5422,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
@@ -5673,8 +5672,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 a9ec89128..eeaa04b5d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4620,8 +4620,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
@@ -4796,8 +4796,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 eeeb1f3a7..0d7d2f436 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4597,8 +4597,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
@@ -4772,8 +4772,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 7a9690bdd..17dc3fce9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4551,8 +4551,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
@@ -4725,8 +4725,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 ad81c35e1..3449d110d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4528,8 +4528,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
@@ -4701,8 +4701,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 331dbad55..61ff8d998 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4550,8 +4550,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
@@ -4724,8 +4724,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 cd134725d..8361ec128 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4527,8 +4527,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
@@ -4700,8 +4700,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 625f94d7d..4926defdb 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4447,8 +4447,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
@@ -4620,8 +4620,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 728c5bb84..ce80125a7 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4424,8 +4424,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
@@ -4596,8 +4596,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