diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 4eb642825..edd96734c 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1547,8 +1547,6 @@ CONFIG_X25=m ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index fd089629b..ea666b771 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1629,8 +1629,6 @@ CONFIG_X25=m ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index af5c88053..b178e4db2 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -1526,8 +1526,6 @@ CONFIG_SECURITY_FILE_CAPABILITIES=y ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index eb2f5b272..93505acd3 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -1020,13 +1020,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 2c2b6667b..3f4d64a2e 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -1097,13 +1097,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 05bc8d750..0572afd31 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -1649,13 +1649,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/arm/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 94381c4a5..2f570ce18 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1814,6 +1814,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_USER_SCHED=y ## end choice CONFIG_CGROUP_CPUACCT=y +# CONFIG_RESOURCE_COUNTERS is not set CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_PROC_PID_CPUSET=y CONFIG_RELAY=y @@ -2363,6 +2364,13 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +## +## file: sound/Kconfig +## +CONFIG_SOUND=m +CONFIG_SND=m +# CONFIG_SOUND_PRIME is not set + ## ## file: sound/core/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index fdf89742f..3abcbc41f 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -842,13 +842,6 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_X25 is not set -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/i386/config b/debian/config/i386/config index 560ae4063..dc71f0a9e 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1895,8 +1895,6 @@ CONFIG_X25=m ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 8e4530c65..13e2028bf 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -1077,7 +1077,6 @@ CONFIG_IRNET=m ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index ccca77a4f..9741fc8a3 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -291,7 +291,7 @@ CONFIG_IPX=m ## ## file: sound/Kconfig ## -CONFIG_SOUND=m +# CONFIG_SND is not set ## ## file: sound/oss/dmasound/Kconfig diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index 682dc536f..2d99829f4 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -191,7 +191,7 @@ CONFIG_IPX=m ## ## file: sound/Kconfig ## -CONFIG_SOUND=m +# CONFIG_SND is not set ## ## file: sound/oss/dmasound/Kconfig diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index db72e2874..db89a92d1 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -2436,7 +2436,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=m CONFIG_AC97_BUS=m diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 56ef42ce5..42d2735e4 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -2852,7 +2852,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=m CONFIG_AC97_BUS=m diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index c04a4ab54..ce9f3cdca 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -755,8 +755,6 @@ CONFIG_TIPC_LOG=0 ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 9d3481e72..07d2d21c5 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -975,8 +975,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 4ca0cef7c..80ede938e 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -1459,7 +1459,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=y ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 6d4d883c6..20158d6f8 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -1426,7 +1426,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=y ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 59c196819..661813cb8 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -2403,7 +2403,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=m CONFIG_AC97_BUS=m diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 900ace1a8..1579562d8 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -2837,7 +2837,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=m CONFIG_AC97_BUS=m diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 88f7f35fd..7c166438b 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -1028,13 +1028,6 @@ CONFIG_TIPC_LOG=0 ## # CONFIG_X25 is not set -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index aee74b191..fe6a8b1ae 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -1512,7 +1512,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=y ## diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 452067621..972e436da 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -1427,7 +1427,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SND=m CONFIG_SOUND_PRIME=y ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 0f517911f..5e6f89d5c 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -1209,13 +1209,6 @@ CONFIG_WAN_ROUTER=m ## CONFIG_X25=m -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/aoa/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 600beadff..5811ab2e8 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -383,13 +383,6 @@ CONFIG_LLC2=m ## # CONFIG_X25 is not set -## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - ## ## file: sound/core/Kconfig ##