[kernel] r10857 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
Bastian Blank
waldi at alioth.debian.org
Fri Mar 14 13:52:26 UTC 2008
Author: waldi
Date: Fri Mar 14 13:52:24 2008
New Revision: 10857
Log:
debian/config: Centralize core sound options.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/arm/config.footbridge
dists/trunk/linux-2.6/debian/config/arm/config.iop32x
dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/config/arm/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/m68k/config.amiga
dists/trunk/linux-2.6/debian/config/m68k/config.atari
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/sparc/config
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Fri Mar 14 13:52:24 2008
@@ -1547,8 +1547,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Fri Mar 14 13:52:24 2008
@@ -1629,8 +1629,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 13:52:24 2008
@@ -1526,8 +1526,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 13:52:24 2008
@@ -1021,13 +1021,6 @@
CONFIG_NET_KEY=m
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_TIMER=m
Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 13:52:24 2008
@@ -1098,13 +1098,6 @@
CONFIG_NET_KEY=m
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_TIMER=m
Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile Fri Mar 14 13:52:24 2008
@@ -1650,13 +1650,6 @@
# 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
##
# CONFIG_SND_ARMAACI is not set
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config (original)
+++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 13:52:24 2008
@@ -1814,6 +1814,7 @@
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
@@ -2364,6 +2365,13 @@
# 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
##
CONFIG_SND_PCM_OSS_PLUGINS=y
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Mar 14 13:52:24 2008
@@ -843,13 +843,6 @@
# CONFIG_X25 is not set
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_TIMER=m
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 13:52:24 2008
@@ -1895,8 +1895,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Mar 14 13:52:24 2008
@@ -1077,7 +1077,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga (original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga Fri Mar 14 13:52:24 2008
@@ -291,7 +291,7 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
+# CONFIG_SND is not set
##
## file: sound/oss/dmasound/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari (original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari Fri Mar 14 13:52:24 2008
@@ -191,7 +191,7 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
+# CONFIG_SND is not set
##
## file: sound/oss/dmasound/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 13:52:24 2008
@@ -2436,7 +2436,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
CONFIG_AC97_BUS=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 13:52:24 2008
@@ -2852,7 +2852,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
CONFIG_AC97_BUS=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Fri Mar 14 13:52:24 2008
@@ -755,8 +755,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Mar 14 13:52:24 2008
@@ -975,8 +975,6 @@
##
## file: sound/Kconfig
##
-CONFIG_SOUND=m
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
##
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Mar 14 13:52:24 2008
@@ -1459,7 +1459,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=y
##
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Mar 14 13:52:24 2008
@@ -1426,7 +1426,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=y
##
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Fri Mar 14 13:52:24 2008
@@ -2403,7 +2403,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
CONFIG_AC97_BUS=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Fri Mar 14 13:52:24 2008
@@ -2837,7 +2837,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=m
CONFIG_AC97_BUS=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Mar 14 13:52:24 2008
@@ -1029,13 +1029,6 @@
# CONFIG_X25 is not set
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_TIMER=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Fri Mar 14 13:52:24 2008
@@ -1512,7 +1512,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=y
##
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Fri Mar 14 13:52:24 2008
@@ -1427,7 +1427,6 @@
## file: sound/Kconfig
##
CONFIG_SOUND=y
-CONFIG_SND=m
CONFIG_SOUND_PRIME=y
##
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 13:52:24 2008
@@ -1210,13 +1210,6 @@
CONFIG_X25=m
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/aoa/Kconfig
##
CONFIG_SND_AOA=m
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Fri Mar 14 13:52:24 2008
@@ -384,13 +384,6 @@
# CONFIG_X25 is not set
##
-## file: sound/Kconfig
-##
-CONFIG_SOUND=m
-CONFIG_SND=m
-# CONFIG_SOUND_PRIME is not set
-
-##
## file: sound/core/Kconfig
##
CONFIG_SND_MIXER_OSS=m
More information about the Kernel-svn-changes
mailing list