[kernel] r9256 - in dists/trunk/linux-2.6/debian/config: alpha amd64 arm i386 ia64 mips mipsel
Maximilian Attems
maks at alioth.debian.org
Sun Aug 5 08:50:04 UTC 2007
Author: maks
Date: Sun Aug 5 08:50:03 2007
New Revision: 9256
Log:
options depending on OSS_OBSOLOTE are gone, kick them.
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/i386/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/mips/config.4kc-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.r5k-cobalt
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
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 Sun Aug 5 08:50:03 2007
@@ -1107,25 +1107,20 @@
CONFIG_SND_USB_USX2Y=m
CONFIG_SND_VXP440=m
CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_BT878=m
CONFIG_SOUND_CMPCI=m
CONFIG_SOUND_CS4281=m
CONFIG_SOUND_ES1370=m
CONFIG_SOUND_ESSSOLO1=m
CONFIG_SOUND_MAESTRO=m
CONFIG_SOUND_MAESTRO3=m
-CONFIG_SOUND_ICH=m
CONFIG_SOUND_SONICVIBES=m
CONFIG_SOUND_TRIDENT=m
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_MIDI_VIA82CXXX=y
CONFIG_SOUND_OSS=m
# CONFIG_SOUND_TRACEINIT is not set
# CONFIG_SOUND_DMAP is not set
CONFIG_SOUND_SGALAXY=m
-CONFIG_SOUND_CS4232=m
CONFIG_SOUND_SSCAPE=m
CONFIG_SOUND_GUS=m
CONFIG_SOUND_GUS16=y
@@ -1155,7 +1150,6 @@
CONFIG_SC6600_CDROMBASE=0x0
CONFIG_AEDSP16_MSS=y
# CONFIG_AEDSP16_SBPRO is not set
-CONFIG_SOUND_TVMIXER=m
CONFIG_SOUND_KAHLUA=m
CONFIG_SOUND_ALI5455=m
CONFIG_SOUND_FORTE=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 Sun Aug 5 08:50:03 2007
@@ -1043,18 +1043,12 @@
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_USX2Y=m
CONFIG_SOUND_PRIME=m
-# CONFIG_OSS_OBSOLETE is not set
-CONFIG_SOUND_BT878=m
-CONFIG_SOUND_ICH=m
CONFIG_SOUND_TRIDENT=m
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_MIDI_VIA82CXXX=y
CONFIG_SOUND_OSS=m
# CONFIG_SOUND_TRACEINIT is not set
# CONFIG_SOUND_DMAP is not set
-CONFIG_SOUND_CS4232=m
CONFIG_SOUND_SSCAPE=m
CONFIG_SOUND_VMIDI=m
CONFIG_SOUND_TRIX=m
@@ -1073,7 +1067,6 @@
CONFIG_SC6600_CDROMBASE=0x0
# CONFIG_AEDSP16_MSS is not set
# CONFIG_AEDSP16_SBPRO is not set
-CONFIG_SOUND_TVMIXER=m
CONFIG_SOUND_KAHLUA=m
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
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 Sun Aug 5 08:50:03 2007
@@ -1221,7 +1221,6 @@
#
CONFIG_SOUND_PRIME=m
CONFIG_OBSOLETE_OSS_DRIVER=y
-# CONFIG_SOUND_BT878 is not set
# CONFIG_SOUND_CMPCI is not set
# CONFIG_SOUND_EMU10K1 is not set
# CONFIG_SOUND_FUSION is not set
@@ -1230,12 +1229,10 @@
# CONFIG_SOUND_ESSSOLO1 is not set
# CONFIG_SOUND_MAESTRO is not set
# CONFIG_SOUND_MAESTRO3 is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_SONICVIBES is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_SOUND_OSS=m
# CONFIG_SOUND_TRACEINIT is not set
# CONFIG_SOUND_DMAP is not set
@@ -1244,7 +1241,6 @@
# CONFIG_SOUND_SGALAXY is not set
# CONFIG_SOUND_ADLIB is not set
# CONFIG_SOUND_ACI_MIXER is not set
-# CONFIG_SOUND_CS4232 is not set
# CONFIG_SOUND_SSCAPE is not set
# CONFIG_SOUND_GUS is not set
# CONFIG_SOUND_VMIDI is not set
@@ -1266,7 +1262,6 @@
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
CONFIG_SOUND_WAVEARTIST=m
-# CONFIG_SOUND_TVMIXER is not set
# CONFIG_SOUND_ALI5455 is not set
# CONFIG_SOUND_FORTE is not set
# CONFIG_SOUND_RME96XX is not set
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 Sun Aug 5 08:50:03 2007
@@ -1264,18 +1264,12 @@
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_USX2Y=m
CONFIG_SOUND_PRIME=m
-# CONFIG_OSS_OBSOLETE is not set
-CONFIG_SOUND_BT878=m
-CONFIG_SOUND_ICH=m
CONFIG_SOUND_TRIDENT=m
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_MIDI_VIA82CXXX=y
CONFIG_SOUND_OSS=m
# CONFIG_SOUND_TRACEINIT is not set
# CONFIG_SOUND_DMAP is not set
-CONFIG_SOUND_CS4232=m
CONFIG_SOUND_SSCAPE=m
CONFIG_SOUND_VMIDI=m
CONFIG_SOUND_TRIX=m
@@ -1294,7 +1288,6 @@
CONFIG_SC6600_CDROMBASE=0x0
# CONFIG_AEDSP16_MSS is not set
# CONFIG_AEDSP16_SBPRO is not set
-CONFIG_SOUND_TVMIXER=m
CONFIG_SOUND_KAHLUA=m
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
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 Sun Aug 5 08:50:03 2007
@@ -472,14 +472,12 @@
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_USB_AUDIO=m
CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_BT878=m
CONFIG_SOUND_CMPCI=m
CONFIG_SOUND_CS4281=m
CONFIG_SOUND_ES1370=m
CONFIG_SOUND_ESSSOLO1=m
CONFIG_SOUND_MAESTRO=m
CONFIG_SOUND_MAESTRO3=m
-CONFIG_SOUND_ICH=m
CONFIG_SOUND_SONICVIBES=m
CONFIG_SOUND_TRIDENT=m
CONFIG_SOUND_MSNDCLAS=m
@@ -488,10 +486,7 @@
CONFIG_SOUND_MSNDPIN=m
CONFIG_MSNDPIN_INIT_FILE="m"
CONFIG_MSNDPIN_PERM_FILE="m"
-CONFIG_SOUND_VIA82CXXX=m
-# CONFIG_MIDI_VIA82CXXX is not set
# CONFIG_SOUND_OSS is not set
-CONFIG_SOUND_TVMIXER=m
CONFIG_SOUND_ALI5455=m
CONFIG_SOUND_FORTE=m
CONFIG_SOUND_RME96XX=m
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 Sun Aug 5 08:50:03 2007
@@ -2232,8 +2232,6 @@
# Open Sound System
#
CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_BT878=m
-# CONFIG_SOUND_ICH is not set
CONFIG_SOUND_TRIDENT=m
CONFIG_SOUND_MSNDCLAS=m
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
@@ -2241,8 +2239,6 @@
CONFIG_SOUND_MSNDPIN=m
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
-# CONFIG_SOUND_VIA82CXXX is not set
-CONFIG_SOUND_TVMIXER=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 Sun Aug 5 08:50:03 2007
@@ -993,7 +993,6 @@
CONFIG_SOUND_HAL2=m
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_TVMIXER is not set
#
# USB support
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 Sun Aug 5 08:50:03 2007
@@ -1103,11 +1103,9 @@
CONFIG_SOUND_PRIME=m
# CONFIG_OBSOLETE_OSS_DRIVER is not set
# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_TVMIXER is not set
#
# USB support
@@ -1417,11 +1415,9 @@
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
CONFIG_SOUND_EMU10K1=m
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_FM801_TEA575X=m
-CONFIG_SOUND_BT878=m
CONFIG_VIDEO_BUF=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_BT87X_OVERCLOCK=y
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 Sun Aug 5 08:50:03 2007
@@ -1269,7 +1269,6 @@
# CONFIG_OBSOLETE_OSS_DRIVER is not set
# CONFIG_SOUND_FUSION is not set
# CONFIG_SOUND_BCM_CS4297A is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
@@ -1700,7 +1699,6 @@
CONFIG_USB_FILE_STORAGE=m
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SOUND_EMU10K1=m
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_USB_EPSON2888=y
CONFIG_SND_VIRMIDI=m
CONFIG_USB_AN2720=y
@@ -1710,7 +1708,6 @@
CONFIG_USB_GADGET_NET2280=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGET_DEBUG_FILES is not set
-CONFIG_SOUND_BT878=m
CONFIG_VIDEO_BUF=m
CONFIG_USB_FILE_STORAGE_TEST=y
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
@@ -1726,6 +1723,5 @@
CONFIG_USB_BELKIN=y
CONFIG_USB_ZERO=m
CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SOUND_TVMIXER=m
CONFIG_USB_STORAGE_ONETOUCH=y
CONFIG_USB_ACM=m
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 Sun Aug 5 08:50:03 2007
@@ -1263,7 +1263,6 @@
CONFIG_SOUND_PRIME=y
# CONFIG_OBSOLETE_OSS_DRIVER is not set
# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
@@ -1691,9 +1690,7 @@
CONFIG_TEXTSEARCH_FSM=m
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_SND_VIRMIDI=m
-# CONFIG_SOUND_BT878 is not set
CONFIG_VIDEO_BUF=m
# CONFIG_USB_W9968CF is not set
CONFIG_SND_SEQ_DUMMY=m
@@ -1702,4 +1699,3 @@
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
-CONFIG_SOUND_TVMIXER=m
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 Sun Aug 5 08:50:03 2007
@@ -2232,8 +2232,6 @@
# Open Sound System
#
CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_BT878=m
-# CONFIG_SOUND_ICH is not set
CONFIG_SOUND_TRIDENT=m
CONFIG_SOUND_MSNDCLAS=m
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
@@ -2241,8 +2239,6 @@
CONFIG_SOUND_MSNDPIN=m
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
-# CONFIG_SOUND_VIA82CXXX is not set
-CONFIG_SOUND_TVMIXER=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 Sun Aug 5 08:50:03 2007
@@ -1145,9 +1145,7 @@
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
-CONFIG_SOUND_BT878=n
CONFIG_SOUND_EMU10K1=m
-CONFIG_SOUND_VIA82CXXX=m
#
# USB support
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 Sun Aug 5 08:50:03 2007
@@ -1269,7 +1269,6 @@
# CONFIG_OBSOLETE_OSS_DRIVER is not set
# CONFIG_SOUND_FUSION is not set
# CONFIG_SOUND_BCM_CS4297A is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
@@ -1700,7 +1699,6 @@
CONFIG_USB_FILE_STORAGE=m
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SOUND_EMU10K1=m
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_USB_EPSON2888=y
CONFIG_SND_VIRMIDI=m
CONFIG_USB_AN2720=y
@@ -1710,7 +1708,6 @@
CONFIG_USB_GADGET_NET2280=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGET_DEBUG_FILES is not set
-CONFIG_SOUND_BT878=m
CONFIG_VIDEO_BUF=m
CONFIG_USB_FILE_STORAGE_TEST=y
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
@@ -1726,6 +1723,5 @@
CONFIG_USB_BELKIN=y
CONFIG_USB_ZERO=m
CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SOUND_TVMIXER=m
CONFIG_USB_STORAGE_ONETOUCH=y
CONFIG_USB_ACM=m
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 Sun Aug 5 08:50:03 2007
@@ -1263,7 +1263,6 @@
CONFIG_SOUND_PRIME=y
# CONFIG_OBSOLETE_OSS_DRIVER is not set
# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
@@ -1691,9 +1690,7 @@
CONFIG_TEXTSEARCH_FSM=m
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_SND_VIRMIDI=m
-# CONFIG_SOUND_BT878 is not set
CONFIG_VIDEO_BUF=m
# CONFIG_USB_W9968CF is not set
CONFIG_SND_SEQ_DUMMY=m
@@ -1702,4 +1699,3 @@
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
-CONFIG_SOUND_TVMIXER=m
More information about the Kernel-svn-changes
mailing list