diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-11-09 00:34:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:55:53 -0500 |
commit | cecd1ca0cbd6fc5873e9bb110dacb8411be72928 (patch) | |
tree | 9d27151bc7cda61eb838b8f5b36180fd46c5d308 /sound/oss | |
parent | 88baf3e85af72f606363a85e9a60e9e61cc64a6c (diff) |
[PATCH] schedule obsolete OSS drivers for removal
This patch schedules obsolete OSS drivers (with ALSA drivers that support
the same hardware) for removal.
Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/Kconfig | 73 |
1 files changed, 44 insertions, 29 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 953e5f3ea03d..88e52dc84c09 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -4,9 +4,24 @@ | |||
4 | # More hacking for modularisation. | 4 | # More hacking for modularisation. |
5 | # | 5 | # |
6 | # Prompt user for primary drivers. | 6 | # Prompt user for primary drivers. |
7 | |||
8 | config OBSOLETE_OSS_DRIVER | ||
9 | bool "Obsolete OSS drivers" | ||
10 | depends on SOUND_PRIME | ||
11 | help | ||
12 | This option enables support for obsolete OSS drivers that | ||
13 | are scheduled for removal in the near future since there | ||
14 | are ALSA drivers for the same hardware. | ||
15 | |||
16 | Please contact Adrian Bunk <bunk@stusta.de> if you had to | ||
17 | say Y here because your soundcard is not properly supported | ||
18 | by ALSA. | ||
19 | |||
20 | If unsure, say N. | ||
21 | |||
7 | config SOUND_BT878 | 22 | config SOUND_BT878 |
8 | tristate "BT878 audio dma" | 23 | tristate "BT878 audio dma" |
9 | depends on SOUND_PRIME && PCI | 24 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
10 | ---help--- | 25 | ---help--- |
11 | Audio DMA support for bt878 based grabber boards. As you might have | 26 | Audio DMA support for bt878 based grabber boards. As you might have |
12 | already noticed, bt878 is listed with two functions in /proc/pci. | 27 | already noticed, bt878 is listed with two functions in /proc/pci. |
@@ -22,7 +37,7 @@ config SOUND_BT878 | |||
22 | 37 | ||
23 | config SOUND_CMPCI | 38 | config SOUND_CMPCI |
24 | tristate "C-Media PCI (CMI8338/8738)" | 39 | tristate "C-Media PCI (CMI8338/8738)" |
25 | depends on SOUND_PRIME && PCI | 40 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
26 | help | 41 | help |
27 | Say Y or M if you have a PCI sound card using the CMI8338 | 42 | Say Y or M if you have a PCI sound card using the CMI8338 |
28 | or the CMI8738 chipset. Data on these chips are available at | 43 | or the CMI8738 chipset. Data on these chips are available at |
@@ -61,7 +76,7 @@ config SOUND_CMPCI_JOYSTICK | |||
61 | 76 | ||
62 | config SOUND_EMU10K1 | 77 | config SOUND_EMU10K1 |
63 | tristate "Creative SBLive! (EMU10K1)" | 78 | tristate "Creative SBLive! (EMU10K1)" |
64 | depends on SOUND_PRIME && PCI | 79 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
65 | ---help--- | 80 | ---help--- |
66 | Say Y or M if you have a PCI sound card using the EMU10K1 chipset, | 81 | Say Y or M if you have a PCI sound card using the EMU10K1 chipset, |
67 | such as the Creative SBLive!, SB PCI512 or Emu-APS. | 82 | such as the Creative SBLive!, SB PCI512 or Emu-APS. |
@@ -95,7 +110,7 @@ config SOUND_FUSION | |||
95 | 110 | ||
96 | config SOUND_CS4281 | 111 | config SOUND_CS4281 |
97 | tristate "Crystal Sound CS4281" | 112 | tristate "Crystal Sound CS4281" |
98 | depends on SOUND_PRIME && PCI | 113 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
99 | help | 114 | help |
100 | Picture and feature list at | 115 | Picture and feature list at |
101 | <http://www.pcbroker.com/crystal4281.html>. | 116 | <http://www.pcbroker.com/crystal4281.html>. |
@@ -112,7 +127,7 @@ config SOUND_BCM_CS4297A | |||
112 | 127 | ||
113 | config SOUND_ES1370 | 128 | config SOUND_ES1370 |
114 | tristate "Ensoniq AudioPCI (ES1370)" | 129 | tristate "Ensoniq AudioPCI (ES1370)" |
115 | depends on SOUND_PRIME && PCI | 130 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
116 | help | 131 | help |
117 | Say Y or M if you have a PCI sound card utilizing the Ensoniq | 132 | Say Y or M if you have a PCI sound card utilizing the Ensoniq |
118 | ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find | 133 | ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find |
@@ -125,7 +140,7 @@ config SOUND_ES1370 | |||
125 | 140 | ||
126 | config SOUND_ES1371 | 141 | config SOUND_ES1371 |
127 | tristate "Creative Ensoniq AudioPCI 97 (ES1371)" | 142 | tristate "Creative Ensoniq AudioPCI 97 (ES1371)" |
128 | depends on SOUND_PRIME && PCI | 143 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
129 | help | 144 | help |
130 | Say Y or M if you have a PCI sound card utilizing the Ensoniq | 145 | Say Y or M if you have a PCI sound card utilizing the Ensoniq |
131 | ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if | 146 | ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if |
@@ -138,7 +153,7 @@ config SOUND_ES1371 | |||
138 | 153 | ||
139 | config SOUND_ESSSOLO1 | 154 | config SOUND_ESSSOLO1 |
140 | tristate "ESS Technology Solo1" | 155 | tristate "ESS Technology Solo1" |
141 | depends on SOUND_PRIME && PCI | 156 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
142 | help | 157 | help |
143 | Say Y or M if you have a PCI sound card utilizing the ESS Technology | 158 | Say Y or M if you have a PCI sound card utilizing the ESS Technology |
144 | Solo1 chip. To find out if your sound card uses a | 159 | Solo1 chip. To find out if your sound card uses a |
@@ -149,7 +164,7 @@ config SOUND_ESSSOLO1 | |||
149 | 164 | ||
150 | config SOUND_MAESTRO | 165 | config SOUND_MAESTRO |
151 | tristate "ESS Maestro, Maestro2, Maestro2E driver" | 166 | tristate "ESS Maestro, Maestro2, Maestro2E driver" |
152 | depends on SOUND_PRIME && PCI | 167 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
153 | help | 168 | help |
154 | Say Y or M if you have a sound system driven by ESS's Maestro line | 169 | Say Y or M if you have a sound system driven by ESS's Maestro line |
155 | of PCI sound chips. These include the Maestro 1, Maestro 2, and | 170 | of PCI sound chips. These include the Maestro 1, Maestro 2, and |
@@ -158,7 +173,7 @@ config SOUND_MAESTRO | |||
158 | 173 | ||
159 | config SOUND_MAESTRO3 | 174 | config SOUND_MAESTRO3 |
160 | tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)" | 175 | tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)" |
161 | depends on SOUND_PRIME && PCI && EXPERIMENTAL | 176 | depends on SOUND_PRIME && PCI && EXPERIMENTAL && OBSOLETE_OSS_DRIVER |
162 | help | 177 | help |
163 | Say Y or M if you have a sound system driven by ESS's Maestro 3 | 178 | Say Y or M if you have a sound system driven by ESS's Maestro 3 |
164 | PCI sound chip. | 179 | PCI sound chip. |
@@ -172,14 +187,14 @@ config SOUND_ICH | |||
172 | 187 | ||
173 | config SOUND_HARMONY | 188 | config SOUND_HARMONY |
174 | tristate "PA Harmony audio driver" | 189 | tristate "PA Harmony audio driver" |
175 | depends on GSC_LASI && SOUND_PRIME | 190 | depends on GSC_LASI && SOUND_PRIME && OBSOLETE_OSS_DRIVER |
176 | help | 191 | help |
177 | Say 'Y' or 'M' to include support for Harmony soundchip | 192 | Say 'Y' or 'M' to include support for Harmony soundchip |
178 | on HP 712, 715/new and many other GSC based machines. | 193 | on HP 712, 715/new and many other GSC based machines. |
179 | 194 | ||
180 | config SOUND_SONICVIBES | 195 | config SOUND_SONICVIBES |
181 | tristate "S3 SonicVibes" | 196 | tristate "S3 SonicVibes" |
182 | depends on SOUND_PRIME && PCI | 197 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
183 | help | 198 | help |
184 | Say Y or M if you have a PCI sound card utilizing the S3 | 199 | Say Y or M if you have a PCI sound card utilizing the S3 |
185 | SonicVibes chipset. To find out if your sound card uses a | 200 | SonicVibes chipset. To find out if your sound card uses a |
@@ -218,7 +233,7 @@ config SOUND_VRC5477 | |||
218 | 233 | ||
219 | config SOUND_AU1000 | 234 | config SOUND_AU1000 |
220 | tristate "Au1000 Sound" | 235 | tristate "Au1000 Sound" |
221 | depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) | 236 | depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && OBSOLETE_OSS_DRIVER |
222 | 237 | ||
223 | config SOUND_AU1550_AC97 | 238 | config SOUND_AU1550_AC97 |
224 | tristate "Au1550 AC97 Sound" | 239 | tristate "Au1550 AC97 Sound" |
@@ -492,7 +507,7 @@ config MSND_FIFOSIZE | |||
492 | 507 | ||
493 | config SOUND_VIA82CXXX | 508 | config SOUND_VIA82CXXX |
494 | tristate "VIA 82C686 Audio Codec" | 509 | tristate "VIA 82C686 Audio Codec" |
495 | depends on SOUND_PRIME && PCI | 510 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
496 | help | 511 | help |
497 | Say Y here to include support for the audio codec found on VIA | 512 | Say Y here to include support for the audio codec found on VIA |
498 | 82Cxxx-based chips. Typically these are built into a motherboard. | 513 | 82Cxxx-based chips. Typically these are built into a motherboard. |
@@ -563,7 +578,7 @@ config SOUND_AD1889 | |||
563 | 578 | ||
564 | config SOUND_SGALAXY | 579 | config SOUND_SGALAXY |
565 | tristate "Aztech Sound Galaxy (non-PnP) cards" | 580 | tristate "Aztech Sound Galaxy (non-PnP) cards" |
566 | depends on SOUND_OSS | 581 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
567 | help | 582 | help |
568 | This module initializes the older non Plug and Play sound galaxy | 583 | This module initializes the older non Plug and Play sound galaxy |
569 | cards from Aztech. It supports the Waverider Pro 32 - 3D and the | 584 | cards from Aztech. It supports the Waverider Pro 32 - 3D and the |
@@ -599,7 +614,7 @@ config SOUND_ACI_MIXER | |||
599 | 614 | ||
600 | config SOUND_CS4232 | 615 | config SOUND_CS4232 |
601 | tristate "Crystal CS4232 based (PnP) cards" | 616 | tristate "Crystal CS4232 based (PnP) cards" |
602 | depends on SOUND_OSS | 617 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
603 | help | 618 | help |
604 | Say Y here if you have a card based on the Crystal CS4232 chip set, | 619 | Say Y here if you have a card based on the Crystal CS4232 chip set, |
605 | which uses its own Plug and Play protocol. | 620 | which uses its own Plug and Play protocol. |
@@ -613,7 +628,7 @@ config SOUND_CS4232 | |||
613 | 628 | ||
614 | config SOUND_SSCAPE | 629 | config SOUND_SSCAPE |
615 | tristate "Ensoniq SoundScape support" | 630 | tristate "Ensoniq SoundScape support" |
616 | depends on SOUND_OSS | 631 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
617 | help | 632 | help |
618 | Answer Y if you have a sound card based on the Ensoniq SoundScape | 633 | Answer Y if you have a sound card based on the Ensoniq SoundScape |
619 | chipset. Such cards are being manufactured at least by Ensoniq, Spea | 634 | chipset. Such cards are being manufactured at least by Ensoniq, Spea |
@@ -625,7 +640,7 @@ config SOUND_SSCAPE | |||
625 | 640 | ||
626 | config SOUND_GUS | 641 | config SOUND_GUS |
627 | tristate "Gravis Ultrasound support" | 642 | tristate "Gravis Ultrasound support" |
628 | depends on SOUND_OSS | 643 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
629 | help | 644 | help |
630 | Say Y here for any type of Gravis Ultrasound card, including the GUS | 645 | Say Y here for any type of Gravis Ultrasound card, including the GUS |
631 | or GUS MAX. See also <file:Documentation/sound/oss/ultrasound> for more | 646 | or GUS MAX. See also <file:Documentation/sound/oss/ultrasound> for more |
@@ -727,7 +742,7 @@ config SOUND_MPU401 | |||
727 | 742 | ||
728 | config SOUND_NM256 | 743 | config SOUND_NM256 |
729 | tristate "NM256AV/NM256ZX audio support" | 744 | tristate "NM256AV/NM256ZX audio support" |
730 | depends on SOUND_OSS | 745 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
731 | help | 746 | help |
732 | Say M here to include audio support for the NeoMagic 256AV/256ZX | 747 | Say M here to include audio support for the NeoMagic 256AV/256ZX |
733 | chipsets. These are the audio chipsets found in the Sony | 748 | chipsets. These are the audio chipsets found in the Sony |
@@ -739,7 +754,7 @@ config SOUND_NM256 | |||
739 | 754 | ||
740 | config SOUND_MAD16 | 755 | config SOUND_MAD16 |
741 | tristate "OPTi MAD16 and/or Mozart based cards" | 756 | tristate "OPTi MAD16 and/or Mozart based cards" |
742 | depends on SOUND_OSS | 757 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
743 | ---help--- | 758 | ---help--- |
744 | Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi | 759 | Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi |
745 | 82C928 or 82C929 or 82C931) audio interface chip. These chips are | 760 | 82C928 or 82C929 or 82C931) audio interface chip. These chips are |
@@ -860,7 +875,7 @@ config SOUND_SB | |||
860 | 875 | ||
861 | config SOUND_AWE32_SYNTH | 876 | config SOUND_AWE32_SYNTH |
862 | tristate "AWE32 synth" | 877 | tristate "AWE32 synth" |
863 | depends on SOUND_OSS | 878 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
864 | help | 879 | help |
865 | Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or | 880 | Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or |
866 | similar sound card. See <file:Documentation/sound/oss/README.awe>, | 881 | similar sound card. See <file:Documentation/sound/oss/README.awe>, |
@@ -870,7 +885,7 @@ config SOUND_AWE32_SYNTH | |||
870 | 885 | ||
871 | config SOUND_WAVEFRONT | 886 | config SOUND_WAVEFRONT |
872 | tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards" | 887 | tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards" |
873 | depends on SOUND_OSS && m | 888 | depends on SOUND_OSS && m && OBSOLETE_OSS_DRIVER |
874 | help | 889 | help |
875 | Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card | 890 | Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card |
876 | and read the files <file:Documentation/sound/oss/Wavefront> and | 891 | and read the files <file:Documentation/sound/oss/Wavefront> and |
@@ -878,7 +893,7 @@ config SOUND_WAVEFRONT | |||
878 | 893 | ||
879 | config SOUND_MAUI | 894 | config SOUND_MAUI |
880 | tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers" | 895 | tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers" |
881 | depends on SOUND_OSS | 896 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
882 | help | 897 | help |
883 | Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez | 898 | Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez |
884 | sound card. | 899 | sound card. |
@@ -904,7 +919,7 @@ config MAUI_BOOT_FILE | |||
904 | 919 | ||
905 | config SOUND_YM3812 | 920 | config SOUND_YM3812 |
906 | tristate "Yamaha FM synthesizer (YM3812/OPL-3) support" | 921 | tristate "Yamaha FM synthesizer (YM3812/OPL-3) support" |
907 | depends on SOUND_OSS | 922 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
908 | ---help--- | 923 | ---help--- |
909 | Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4). | 924 | Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4). |
910 | Answering Y is usually a safe and recommended choice, however some | 925 | Answering Y is usually a safe and recommended choice, however some |
@@ -920,7 +935,7 @@ config SOUND_YM3812 | |||
920 | 935 | ||
921 | config SOUND_OPL3SA1 | 936 | config SOUND_OPL3SA1 |
922 | tristate "Yamaha OPL3-SA1 audio controller" | 937 | tristate "Yamaha OPL3-SA1 audio controller" |
923 | depends on SOUND_OSS | 938 | depends on SOUND_OSS && OBSOLETE_OSS_DRIVER |
924 | help | 939 | help |
925 | Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is | 940 | Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is |
926 | usually built into motherboards. Read | 941 | usually built into motherboards. Read |
@@ -946,7 +961,7 @@ config SOUND_OPL3SA2 | |||
946 | 961 | ||
947 | config SOUND_YMFPCI | 962 | config SOUND_YMFPCI |
948 | tristate "Yamaha YMF7xx PCI audio (native mode)" | 963 | tristate "Yamaha YMF7xx PCI audio (native mode)" |
949 | depends on SOUND_OSS && PCI | 964 | depends on SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER |
950 | help | 965 | help |
951 | Support for Yamaha cards including the YMF711, YMF715, YMF718, | 966 | Support for Yamaha cards including the YMF711, YMF715, YMF718, |
952 | YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital. | 967 | YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital. |
@@ -1088,11 +1103,11 @@ config SOUND_KAHLUA | |||
1088 | 1103 | ||
1089 | config SOUND_ALI5455 | 1104 | config SOUND_ALI5455 |
1090 | tristate "ALi5455 audio support" | 1105 | tristate "ALi5455 audio support" |
1091 | depends on SOUND_PRIME && PCI | 1106 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
1092 | 1107 | ||
1093 | config SOUND_FORTE | 1108 | config SOUND_FORTE |
1094 | tristate "ForteMedia FM801 driver" | 1109 | tristate "ForteMedia FM801 driver" |
1095 | depends on SOUND_PRIME && PCI | 1110 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
1096 | help | 1111 | help |
1097 | Say Y or M if you want driver support for the ForteMedia FM801 PCI | 1112 | Say Y or M if you want driver support for the ForteMedia FM801 PCI |
1098 | audio controller (Abit AU10, Genius Sound Maker, HP Workstation | 1113 | audio controller (Abit AU10, Genius Sound Maker, HP Workstation |
@@ -1100,7 +1115,7 @@ config SOUND_FORTE | |||
1100 | 1115 | ||
1101 | config SOUND_RME96XX | 1116 | config SOUND_RME96XX |
1102 | tristate "RME Hammerfall (RME96XX) support" | 1117 | tristate "RME Hammerfall (RME96XX) support" |
1103 | depends on SOUND_PRIME && PCI | 1118 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER |
1104 | help | 1119 | help |
1105 | Say Y or M if you have a Hammerfall or Hammerfall light | 1120 | Say Y or M if you have a Hammerfall or Hammerfall light |
1106 | multichannel card from RME. If you want to access advanced | 1121 | multichannel card from RME. If you want to access advanced |
@@ -1108,7 +1123,7 @@ config SOUND_RME96XX | |||
1108 | 1123 | ||
1109 | config SOUND_AD1980 | 1124 | config SOUND_AD1980 |
1110 | tristate "AD1980 front/back switch plugin" | 1125 | tristate "AD1980 front/back switch plugin" |
1111 | depends on SOUND_PRIME | 1126 | depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER |
1112 | 1127 | ||
1113 | config SOUND_SH_DAC_AUDIO | 1128 | config SOUND_SH_DAC_AUDIO |
1114 | tristate "SuperH DAC audio support" | 1129 | tristate "SuperH DAC audio support" |