diff --git a/debian/config/alpha/config b/debian/config/alpha/config index d352d969b..ee7ac8161 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1666,7 +1666,6 @@ CONFIG_SND_YMFPCI=m ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 652fc609c..ab8f71973 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1707,6 +1707,5 @@ CONFIG_SND_YMFPCI=m ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index bae22d752..25b402b1d 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -1639,11 +1639,6 @@ CONFIG_SOUND_WAVEARTIST=m # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index ef396f1e0..b12e8aa63 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -1095,11 +1095,6 @@ CONFIG_SND_RIPTIDE=m # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 137004274..cd8241989 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -1166,11 +1166,6 @@ CONFIG_SND_PCXHR=m # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 0199694ba..c77f55ee7 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -1650,10 +1650,3 @@ CONFIG_SND_DUMMY=m ## # CONFIG_SND_SOC is not set -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set - diff --git a/debian/config/config b/debian/config/config index ce968b073..ac9c0bd81 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2439,6 +2439,7 @@ CONFIG_SND_PDAUDIOCF=m ## ## file: sound/usb/Kconfig ## +CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 46705dd62..04ea30ad4 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -903,11 +903,6 @@ CONFIG_SND_HARMONY=m # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/i386/config b/debian/config/i386/config index 8f272ef72..d73ad4e55 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -2009,6 +2009,5 @@ CONFIG_SND_YMFPCI=m ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 89a5fece4..18d206865 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -1152,11 +1152,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 2685d3218..050962947 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -2441,11 +2441,6 @@ CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index fc54de848..3a9ba8e40 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -2847,13 +2847,6 @@ CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y - ## ## file: unknown ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 71dd5181d..ae9ad3026 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -1476,11 +1476,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 7ca17bf3c..8ebb71a72 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -1462,11 +1462,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index fcd7c0c2a..f840eb429 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -2406,11 +2406,6 @@ CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index a147883d2..36b713c3f 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -2830,13 +2830,6 @@ CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y - ## ## file: unknown ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 0154cf8bb..475f18838 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -1103,11 +1103,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - ## ## file: unknown ## diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index dde81a864..d73e12012 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -1528,11 +1528,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index b5e0ca73c..9f7d8dabd 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -1462,11 +1462,6 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index c3b9c3410..397cd6b6b 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -1266,7 +1266,6 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m ## diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index 2bf6e9157..ae934ba9b 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -492,11 +492,6 @@ CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m CONFIG_SND_MAESTRO3=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ## diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index 2534bfb9e..430b264a4 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -494,11 +494,6 @@ CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m CONFIG_SND_MAESTRO3=m -## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - ## ## file: unknown ##