aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-06-25 17:59:11 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:05 -0400
commitb6260cd354ec2b3ec026d6c899dc01e442b5e6cc (patch)
treea71e4107b950542316c7d9a53786f62b6108db4e
parent93d17d3d84b7147e8f07aeeb15ec01aa92c6b564 (diff)
[PATCH] change the SOUND_PRIME handling
SOUND_PRIME (for OSS) is a tristate. This doesn't make much sense if most users are checking for SOUND_PRIME!=0. This patch changes the semantics of SOUND_PRIME to being a limit for all OSS modules, IOW: SOUND_PRIME=m does now say that all OSS drivers can only be modular. As a side effect, since SOUND_PRIME already depends on SOUND, there's no longer a reason for drivers depending on SOUND_PRIME to additionally depend on SOUND. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/Kconfig62
1 files changed, 31 insertions, 31 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index e537bd66a707..3b1fafc8f4f5 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -6,7 +6,7 @@
6# Prompt user for primary drivers. 6# Prompt user for primary drivers.
7config SOUND_BT878 7config SOUND_BT878
8 tristate "BT878 audio dma" 8 tristate "BT878 audio dma"
9 depends on SOUND_PRIME!=n && SOUND 9 depends on SOUND_PRIME
10 ---help--- 10 ---help---
11 Audio DMA support for bt878 based grabber boards. As you might have 11 Audio DMA support for bt878 based grabber boards. As you might have
12 already noticed, bt878 is listed with two functions in /proc/pci. 12 already noticed, bt878 is listed with two functions in /proc/pci.
@@ -22,7 +22,7 @@ config SOUND_BT878
22 22
23config SOUND_CMPCI 23config SOUND_CMPCI
24 tristate "C-Media PCI (CMI8338/8738)" 24 tristate "C-Media PCI (CMI8338/8738)"
25 depends on SOUND_PRIME!=n && SOUND && PCI 25 depends on SOUND_PRIME && PCI
26 help 26 help
27 Say Y or M if you have a PCI sound card using the CMI8338 27 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 28 or the CMI8738 chipset. Data on these chips are available at
@@ -61,7 +61,7 @@ config SOUND_CMPCI_JOYSTICK
61 61
62config SOUND_EMU10K1 62config SOUND_EMU10K1
63 tristate "Creative SBLive! (EMU10K1)" 63 tristate "Creative SBLive! (EMU10K1)"
64 depends on SOUND_PRIME!=n && SOUND && PCI 64 depends on SOUND_PRIME && PCI
65 ---help--- 65 ---help---
66 Say Y or M if you have a PCI sound card using the EMU10K1 chipset, 66 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. 67 such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -87,7 +87,7 @@ config MIDI_EMU10K1
87 87
88config SOUND_FUSION 88config SOUND_FUSION
89 tristate "Crystal SoundFusion (CS4280/461x)" 89 tristate "Crystal SoundFusion (CS4280/461x)"
90 depends on SOUND_PRIME!=n && SOUND 90 depends on SOUND_PRIME
91 help 91 help
92 This module drives the Crystal SoundFusion devices (CS4280/46xx 92 This module drives the Crystal SoundFusion devices (CS4280/46xx
93 series) when wired as native sound drivers with AC97 codecs. If 93 series) when wired as native sound drivers with AC97 codecs. If
@@ -95,14 +95,14 @@ config SOUND_FUSION
95 95
96config SOUND_CS4281 96config SOUND_CS4281
97 tristate "Crystal Sound CS4281" 97 tristate "Crystal Sound CS4281"
98 depends on SOUND_PRIME!=n && SOUND 98 depends on SOUND_PRIME
99 help 99 help
100 Picture and feature list at 100 Picture and feature list at
101 <http://www.pcbroker.com/crystal4281.html>. 101 <http://www.pcbroker.com/crystal4281.html>.
102 102
103config SOUND_BCM_CS4297A 103config SOUND_BCM_CS4297A
104 tristate "Crystal Sound CS4297a (for Swarm)" 104 tristate "Crystal Sound CS4297a (for Swarm)"
105 depends on SOUND_PRIME!=n && SIBYTE_SWARM && SOUND 105 depends on SOUND_PRIME && SIBYTE_SWARM
106 help 106 help
107 The BCM91250A has a Crystal CS4297a on synchronous serial 107 The BCM91250A has a Crystal CS4297a on synchronous serial
108 port B (in addition to the DB-9 serial port). Say Y or M 108 port B (in addition to the DB-9 serial port). Say Y or M
@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A
112 112
113config SOUND_ES1370 113config SOUND_ES1370
114 tristate "Ensoniq AudioPCI (ES1370)" 114 tristate "Ensoniq AudioPCI (ES1370)"
115 depends on SOUND_PRIME!=n && SOUND && PCI 115 depends on SOUND_PRIME && PCI
116 help 116 help
117 Say Y or M if you have a PCI sound card utilizing the Ensoniq 117 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 118 ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +125,7 @@ config SOUND_ES1370
125 125
126config SOUND_ES1371 126config SOUND_ES1371
127 tristate "Creative Ensoniq AudioPCI 97 (ES1371)" 127 tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
128 depends on SOUND_PRIME!=n && SOUND && PCI 128 depends on SOUND_PRIME && PCI
129 help 129 help
130 Say Y or M if you have a PCI sound card utilizing the Ensoniq 130 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 131 ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +138,7 @@ config SOUND_ES1371
138 138
139config SOUND_ESSSOLO1 139config SOUND_ESSSOLO1
140 tristate "ESS Technology Solo1" 140 tristate "ESS Technology Solo1"
141 depends on SOUND_PRIME!=n && SOUND && PCI 141 depends on SOUND_PRIME && PCI
142 help 142 help
143 Say Y or M if you have a PCI sound card utilizing the ESS Technology 143 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 144 Solo1 chip. To find out if your sound card uses a
@@ -149,7 +149,7 @@ config SOUND_ESSSOLO1
149 149
150config SOUND_MAESTRO 150config SOUND_MAESTRO
151 tristate "ESS Maestro, Maestro2, Maestro2E driver" 151 tristate "ESS Maestro, Maestro2, Maestro2E driver"
152 depends on SOUND_PRIME!=n && SOUND && PCI 152 depends on SOUND_PRIME && PCI
153 help 153 help
154 Say Y or M if you have a sound system driven by ESS's Maestro line 154 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 155 of PCI sound chips. These include the Maestro 1, Maestro 2, and
@@ -158,28 +158,28 @@ config SOUND_MAESTRO
158 158
159config SOUND_MAESTRO3 159config SOUND_MAESTRO3
160 tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)" 160 tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
161 depends on SOUND_PRIME!=n && SOUND && PCI && EXPERIMENTAL 161 depends on SOUND_PRIME && PCI && EXPERIMENTAL
162 help 162 help
163 Say Y or M if you have a sound system driven by ESS's Maestro 3 163 Say Y or M if you have a sound system driven by ESS's Maestro 3
164 PCI sound chip. 164 PCI sound chip.
165 165
166config SOUND_ICH 166config SOUND_ICH
167 tristate "Intel ICH (i8xx) audio support" 167 tristate "Intel ICH (i8xx) audio support"
168 depends on SOUND_PRIME!=n && PCI 168 depends on SOUND_PRIME && PCI
169 help 169 help
170 Support for integral audio in Intel's I/O Controller Hub (ICH) 170 Support for integral audio in Intel's I/O Controller Hub (ICH)
171 chipset, as used on the 810/820/840 motherboards. 171 chipset, as used on the 810/820/840 motherboards.
172 172
173config SOUND_HARMONY 173config SOUND_HARMONY
174 tristate "PA Harmony audio driver" 174 tristate "PA Harmony audio driver"
175 depends on GSC_LASI && SOUND_PRIME!=n 175 depends on GSC_LASI && SOUND_PRIME
176 help 176 help
177 Say 'Y' or 'M' to include support for Harmony soundchip 177 Say 'Y' or 'M' to include support for Harmony soundchip
178 on HP 712, 715/new and many other GSC based machines. 178 on HP 712, 715/new and many other GSC based machines.
179 179
180config SOUND_SONICVIBES 180config SOUND_SONICVIBES
181 tristate "S3 SonicVibes" 181 tristate "S3 SonicVibes"
182 depends on SOUND_PRIME!=n && SOUND 182 depends on SOUND_PRIME
183 help 183 help
184 Say Y or M if you have a PCI sound card utilizing the S3 184 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 185 SonicVibes chipset. To find out if your sound card uses a
@@ -190,7 +190,7 @@ config SOUND_SONICVIBES
190 190
191config SOUND_VWSND 191config SOUND_VWSND
192 tristate "SGI Visual Workstation Sound" 192 tristate "SGI Visual Workstation Sound"
193 depends on SOUND_PRIME!=n && X86_VISWS && SOUND 193 depends on SOUND_PRIME && X86_VISWS
194 help 194 help
195 Say Y or M if you have an SGI Visual Workstation and you want to be 195 Say Y or M if you have an SGI Visual Workstation and you want to be
196 able to use its on-board audio. Read 196 able to use its on-board audio. Read
@@ -199,18 +199,18 @@ config SOUND_VWSND
199 199
200config SOUND_HAL2 200config SOUND_HAL2
201 tristate "SGI HAL2 sound (EXPERIMENTAL)" 201 tristate "SGI HAL2 sound (EXPERIMENTAL)"
202 depends on SOUND_PRIME!=n && SOUND && SGI_IP22 && EXPERIMENTAL 202 depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL
203 help 203 help
204 Say Y or M if you have an SGI Indy system and want to be able to 204 Say Y or M if you have an SGI Indy system and want to be able to
205 use it's on-board A2 audio system. 205 use it's on-board A2 audio system.
206 206
207config SOUND_IT8172 207config SOUND_IT8172
208 tristate "IT8172G Sound" 208 tristate "IT8172G Sound"
209 depends on SOUND_PRIME!=n && (MIPS_ITE8172 || MIPS_IVR) && SOUND 209 depends on SOUND_PRIME && (MIPS_ITE8172 || MIPS_IVR)
210 210
211config SOUND_VRC5477 211config SOUND_VRC5477
212 tristate "NEC Vrc5477 AC97 sound" 212 tristate "NEC Vrc5477 AC97 sound"
213 depends on SOUND_PRIME!=n && DDB5477 && SOUND 213 depends on SOUND_PRIME && DDB5477
214 help 214 help
215 Say Y here to enable sound support for the NEC Vrc5477 chip, an 215 Say Y here to enable sound support for the NEC Vrc5477 chip, an
216 integrated, multi-function controller chip for MIPS CPUs. Works 216 integrated, multi-function controller chip for MIPS CPUs. Works
@@ -218,15 +218,15 @@ config SOUND_VRC5477
218 218
219config SOUND_AU1000 219config SOUND_AU1000
220 tristate "Au1000 Sound" 220 tristate "Au1000 Sound"
221 depends on SOUND_PRIME!=n && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SOUND 221 depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
222 222
223config SOUND_AU1550_AC97 223config SOUND_AU1550_AC97
224 tristate "Au1550 AC97 Sound" 224 tristate "Au1550 AC97 Sound"
225 depends on SOUND_PRIME!=n && SOC_AU1550 && SOUND 225 depends on SOUND_PRIME && SOC_AU1550
226 226
227config SOUND_TRIDENT 227config SOUND_TRIDENT
228 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" 228 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
229 depends on SOUND_PRIME!=n && SOUND 229 depends on SOUND_PRIME
230 ---help--- 230 ---help---
231 Say Y or M if you have a PCI sound card utilizing the Trident 231 Say Y or M if you have a PCI sound card utilizing the Trident
232 4DWave-DX/NX chipset or your mother board chipset has SiS 7018 232 4DWave-DX/NX chipset or your mother board chipset has SiS 7018
@@ -267,7 +267,7 @@ config SOUND_TRIDENT
267 267
268config SOUND_MSNDCLAS 268config SOUND_MSNDCLAS
269 tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" 269 tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
270 depends on SOUND_PRIME!=n && SOUND && (m || !STANDALONE) 270 depends on SOUND_PRIME && (m || !STANDALONE)
271 help 271 help
272 Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or 272 Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
273 Monterey (not for the Pinnacle or Fiji). 273 Monterey (not for the Pinnacle or Fiji).
@@ -331,7 +331,7 @@ config MSNDCLAS_IO
331 331
332config SOUND_MSNDPIN 332config SOUND_MSNDPIN
333 tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji" 333 tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji"
334 depends on SOUND_PRIME!=n && SOUND && (m || !STANDALONE) 334 depends on SOUND_PRIME && (m || !STANDALONE)
335 help 335 help
336 Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. 336 Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
337 See <file:Documentation/sound/oss/MultiSound> for important information 337 See <file:Documentation/sound/oss/MultiSound> for important information
@@ -492,7 +492,7 @@ config MSND_FIFOSIZE
492 492
493config SOUND_VIA82CXXX 493config SOUND_VIA82CXXX
494 tristate "VIA 82C686 Audio Codec" 494 tristate "VIA 82C686 Audio Codec"
495 depends on SOUND_PRIME!=n && PCI 495 depends on SOUND_PRIME && PCI
496 help 496 help
497 Say Y here to include support for the audio codec found on VIA 497 Say Y here to include support for the audio codec found on VIA
498 82Cxxx-based chips. Typically these are built into a motherboard. 498 82Cxxx-based chips. Typically these are built into a motherboard.
@@ -512,7 +512,7 @@ config MIDI_VIA82CXXX
512 512
513config SOUND_OSS 513config SOUND_OSS
514 tristate "OSS sound modules" 514 tristate "OSS sound modules"
515 depends on SOUND_PRIME!=n && SOUND 515 depends on SOUND_PRIME
516 help 516 help
517 OSS is the Open Sound System suite of sound card drivers. They make 517 OSS is the Open Sound System suite of sound card drivers. They make
518 sound programming easier since they provide a common API. Say Y or 518 sound programming easier since they provide a common API. Say Y or
@@ -1077,7 +1077,7 @@ config SOUND_WAVEARTIST
1077 1077
1078config SOUND_TVMIXER 1078config SOUND_TVMIXER
1079 tristate "TV card (bt848) mixer support" 1079 tristate "TV card (bt848) mixer support"
1080 depends on SOUND_PRIME!=n && SOUND && I2C 1080 depends on SOUND_PRIME && I2C
1081 help 1081 help
1082 Support for audio mixer facilities on the BT848 TV frame-grabber 1082 Support for audio mixer facilities on the BT848 TV frame-grabber
1083 card. 1083 card.
@@ -1088,11 +1088,11 @@ config SOUND_KAHLUA
1088 1088
1089config SOUND_ALI5455 1089config SOUND_ALI5455
1090 tristate "ALi5455 audio support" 1090 tristate "ALi5455 audio support"
1091 depends on SOUND_PRIME!=n && PCI 1091 depends on SOUND_PRIME && PCI
1092 1092
1093config SOUND_FORTE 1093config SOUND_FORTE
1094 tristate "ForteMedia FM801 driver" 1094 tristate "ForteMedia FM801 driver"
1095 depends on SOUND_PRIME!=n && PCI 1095 depends on SOUND_PRIME && PCI
1096 help 1096 help
1097 Say Y or M if you want driver support for the ForteMedia FM801 PCI 1097 Say Y or M if you want driver support for the ForteMedia FM801 PCI
1098 audio controller (Abit AU10, Genius Sound Maker, HP Workstation 1098 audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1100,7 @@ config SOUND_FORTE
1100 1100
1101config SOUND_RME96XX 1101config SOUND_RME96XX
1102 tristate "RME Hammerfall (RME96XX) support" 1102 tristate "RME Hammerfall (RME96XX) support"
1103 depends on SOUND_PRIME!=n && PCI 1103 depends on SOUND_PRIME && PCI
1104 help 1104 help
1105 Say Y or M if you have a Hammerfall or Hammerfall light 1105 Say Y or M if you have a Hammerfall or Hammerfall light
1106 multichannel card from RME. If you want to access advanced 1106 multichannel card from RME. If you want to access advanced
@@ -1108,11 +1108,11 @@ config SOUND_RME96XX
1108 1108
1109config SOUND_AD1980 1109config SOUND_AD1980
1110 tristate "AD1980 front/back switch plugin" 1110 tristate "AD1980 front/back switch plugin"
1111 depends on SOUND_PRIME!=n 1111 depends on SOUND_PRIME
1112 1112
1113config SOUND_SH_DAC_AUDIO 1113config SOUND_SH_DAC_AUDIO
1114 tristate "SuperH DAC audio support" 1114 tristate "SuperH DAC audio support"
1115 depends on SOUND_PRIME!=n && SOUND && CPU_SH3 1115 depends on SOUND_PRIME && CPU_SH3
1116 1116
1117config SOUND_SH_DAC_AUDIO_CHANNEL 1117config SOUND_SH_DAC_AUDIO_CHANNEL
1118 int " DAC channel" 1118 int " DAC channel"