options depending on OSS_OBSOLOTE are gone, kick them.
svn path=/dists/trunk/linux-2.6/; revision=9256
This commit is contained in:
parent
12832c98d5
commit
7d0836ffbd
|
@ -1107,25 +1107,20 @@ CONFIG_SND_USB_AUDIO=m
|
|||
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_CDROM=4
|
|||
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
|
||||
|
|
|
@ -1043,18 +1043,12 @@ CONFIG_SND_HDA_INTEL=m
|
|||
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_CDROM=4
|
|||
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
|
||||
|
|
|
@ -1221,7 +1221,6 @@ CONFIG_SND_OPL3SA2=m
|
|||
#
|
||||
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_OBSOLETE_OSS_DRIVER=y
|
|||
# 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_OSS=m
|
|||
# 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_YM3812=m
|
|||
# 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
|
||||
|
|
|
@ -1264,18 +1264,12 @@ CONFIG_SND_HDA_INTEL=m
|
|||
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_CDROM=4
|
|||
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
|
||||
|
|
|
@ -472,14 +472,12 @@ CONFIG_SND_VX222=m
|
|||
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_MSNDCLAS_PERM_FILE="m"
|
|||
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
|
||||
|
|
|
@ -2232,8 +2232,6 @@ CONFIG_SND_USB_AUDIO=m
|
|||
# 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_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
|
|||
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
|
||||
|
||||
#
|
||||
|
|
|
@ -993,7 +993,6 @@ CONFIG_SOUND_PRIME=m
|
|||
CONFIG_SOUND_HAL2=m
|
||||
# CONFIG_SOUND_MSNDCLAS is not set
|
||||
# CONFIG_SOUND_MSNDPIN is not set
|
||||
# CONFIG_SOUND_TVMIXER is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
|
|
|
@ -1103,11 +1103,9 @@ CONFIG_SND_SUPPORT_OLD_API=y
|
|||
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_SND_CS46XX_NEW_DSP=y
|
|||
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
|
||||
|
|
|
@ -1269,7 +1269,6 @@ CONFIG_SOUND_PRIME=y
|
|||
# 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_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
|
|||
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_DUALSPEED=y
|
|||
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_G_SERIAL=m
|
|||
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
|
||||
|
|
|
@ -1263,7 +1263,6 @@ CONFIG_SND_YMFPCI=m
|
|||
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_BM=m
|
|||
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_INIT_FILE="/etc/sound/pndspini.bin"
|
|||
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
|
||||
|
|
|
@ -2232,8 +2232,6 @@ CONFIG_SND_USB_AUDIO=m
|
|||
# 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_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
|
|||
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
|
||||
|
||||
#
|
||||
|
|
|
@ -1145,9 +1145,7 @@ CONFIG_SND_USB_AUDIO=m
|
|||
# Open Sound System
|
||||
#
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_SOUND_BT878=n
|
||||
CONFIG_SOUND_EMU10K1=m
|
||||
CONFIG_SOUND_VIA82CXXX=m
|
||||
|
||||
#
|
||||
# USB support
|
||||
|
|
|
@ -1269,7 +1269,6 @@ CONFIG_SOUND_PRIME=y
|
|||
# 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_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
|
|||
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_DUALSPEED=y
|
|||
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_G_SERIAL=m
|
|||
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
|
||||
|
|
|
@ -1263,7 +1263,6 @@ CONFIG_SND_YMFPCI=m
|
|||
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_BM=m
|
|||
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_INIT_FILE="/etc/sound/pndspini.bin"
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue