diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-05-30 05:25:03 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-05-30 05:25:03 -0400 |
commit | 72860b0f3c4a303498c9e16c8a4a38ddf23d56de (patch) | |
tree | 980e117fd94294dc79325ff8802d563f5ee0b354 | |
parent | 8bb8b453cb458d8f62411e78a4cfd6d860b503b6 (diff) |
sound: Clean up sound/oss/Kconfig
Removed unnecessary dependencies, fix a wrong selection, and
make CONFIG_SOUND_OSS menuconfig to simplify.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/oss/Kconfig | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 3be2dc1025b5..33940139844b 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | config SOUND_BCM_CS4297A | 8 | config SOUND_BCM_CS4297A |
9 | tristate "Crystal Sound CS4297a (for Swarm)" | 9 | tristate "Crystal Sound CS4297a (for Swarm)" |
10 | depends on SOUND_PRIME && SIBYTE_SWARM | 10 | depends on SIBYTE_SWARM |
11 | help | 11 | help |
12 | The BCM91250A has a Crystal CS4297a on synchronous serial | 12 | The BCM91250A has a Crystal CS4297a on synchronous serial |
13 | port B (in addition to the DB-9 serial port). Say Y or M | 13 | port B (in addition to the DB-9 serial port). Say Y or M |
@@ -17,7 +17,7 @@ config SOUND_BCM_CS4297A | |||
17 | 17 | ||
18 | config SOUND_VWSND | 18 | config SOUND_VWSND |
19 | tristate "SGI Visual Workstation Sound" | 19 | tristate "SGI Visual Workstation Sound" |
20 | depends on SOUND_PRIME && X86_VISWS | 20 | depends on X86_VISWS |
21 | help | 21 | help |
22 | Say Y or M if you have an SGI Visual Workstation and you want to be | 22 | Say Y or M if you have an SGI Visual Workstation and you want to be |
23 | able to use its on-board audio. Read | 23 | able to use its on-board audio. Read |
@@ -26,19 +26,18 @@ config SOUND_VWSND | |||
26 | 26 | ||
27 | config SOUND_HAL2 | 27 | config SOUND_HAL2 |
28 | tristate "SGI HAL2 sound (EXPERIMENTAL)" | 28 | tristate "SGI HAL2 sound (EXPERIMENTAL)" |
29 | depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL | 29 | depends on SGI_IP22 && EXPERIMENTAL |
30 | help | 30 | help |
31 | Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to | 31 | Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to |
32 | use its on-board A2 audio system. | 32 | use its on-board A2 audio system. |
33 | 33 | ||
34 | config SOUND_AU1550_AC97 | 34 | config SOUND_AU1550_AC97 |
35 | tristate "Au1550/Au1200 AC97 Sound" | 35 | tristate "Au1550/Au1200 AC97 Sound" |
36 | select SND_AC97_CODEC | 36 | depends on SOC_AU1550 || SOC_AU1200 |
37 | depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200) | ||
38 | 37 | ||
39 | config SOUND_TRIDENT | 38 | config SOUND_TRIDENT |
40 | tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" | 39 | tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" |
41 | depends on SOUND_PRIME && PCI | 40 | depends on PCI |
42 | ---help--- | 41 | ---help--- |
43 | Say Y or M if you have a PCI sound card utilizing the Trident | 42 | Say Y or M if you have a PCI sound card utilizing the Trident |
44 | 4DWave-DX/NX chipset or your mother board chipset has SiS 7018 | 43 | 4DWave-DX/NX chipset or your mother board chipset has SiS 7018 |
@@ -79,7 +78,7 @@ config SOUND_TRIDENT | |||
79 | 78 | ||
80 | config SOUND_MSNDCLAS | 79 | config SOUND_MSNDCLAS |
81 | tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" | 80 | tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" |
82 | depends on SOUND_PRIME && (m || !STANDALONE) && ISA | 81 | depends on (m || !STANDALONE) && ISA |
83 | help | 82 | help |
84 | Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or | 83 | Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or |
85 | Monterey (not for the Pinnacle or Fiji). | 84 | Monterey (not for the Pinnacle or Fiji). |
@@ -143,7 +142,7 @@ config MSNDCLAS_IO | |||
143 | 142 | ||
144 | config SOUND_MSNDPIN | 143 | config SOUND_MSNDPIN |
145 | tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji" | 144 | tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji" |
146 | depends on SOUND_PRIME && (m || !STANDALONE) && ISA | 145 | depends on (m || !STANDALONE) && ISA |
147 | help | 146 | help |
148 | Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. | 147 | Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. |
149 | See <file:Documentation/sound/oss/MultiSound> for important information | 148 | See <file:Documentation/sound/oss/MultiSound> for important information |
@@ -229,7 +228,7 @@ config MSNDPIN_NONPNP | |||
229 | configure the card's resources. | 228 | configure the card's resources. |
230 | 229 | ||
231 | comment "MSND Pinnacle DSP section will be configured to above parameters." | 230 | comment "MSND Pinnacle DSP section will be configured to above parameters." |
232 | depends on SOUND_PRIME && SOUND_MSNDPIN=y && MSNDPIN_NONPNP | 231 | depends on SOUND_MSNDPIN=y && MSNDPIN_NONPNP |
233 | 232 | ||
234 | config MSNDPIN_CFG | 233 | config MSNDPIN_CFG |
235 | hex "MSND Pinnacle config port 250,260,270" | 234 | hex "MSND Pinnacle config port 250,260,270" |
@@ -242,7 +241,7 @@ config MSNDPIN_CFG | |||
242 | Mode". | 241 | Mode". |
243 | 242 | ||
244 | comment "Pinnacle-specific Device Configuration (0 disables)" | 243 | comment "Pinnacle-specific Device Configuration (0 disables)" |
245 | depends on SOUND_PRIME && SOUND_MSNDPIN=y && MSNDPIN_NONPNP | 244 | depends on SOUND_MSNDPIN=y && MSNDPIN_NONPNP |
246 | 245 | ||
247 | config MSNDPIN_MPU_IO | 246 | config MSNDPIN_MPU_IO |
248 | hex "MSND Pinnacle MPU I/O (e.g. 330)" | 247 | hex "MSND Pinnacle MPU I/O (e.g. 330)" |
@@ -294,7 +293,7 @@ config MSNDPIN_JOYSTICK_IO | |||
294 | 293 | ||
295 | config MSND_FIFOSIZE | 294 | config MSND_FIFOSIZE |
296 | int "MSND buffer size (kB)" | 295 | int "MSND buffer size (kB)" |
297 | depends on SOUND_PRIME && (SOUND_MSNDPIN=y || SOUND_MSNDCLAS=y) | 296 | depends on SOUND_MSNDPIN=y || SOUND_MSNDCLAS=y |
298 | default "128" | 297 | default "128" |
299 | help | 298 | help |
300 | Configures the size of each audio buffer, in kilobytes, for | 299 | Configures the size of each audio buffer, in kilobytes, for |
@@ -302,9 +301,9 @@ config MSND_FIFOSIZE | |||
302 | and Pinnacle). Larger values reduce the chance of data overruns at | 301 | and Pinnacle). Larger values reduce the chance of data overruns at |
303 | the expense of overall latency. If unsure, use the default. | 302 | the expense of overall latency. If unsure, use the default. |
304 | 303 | ||
305 | config SOUND_OSS | 304 | menuconfig SOUND_OSS |
306 | tristate "OSS sound modules" | 305 | tristate "OSS sound modules" |
307 | depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS | 306 | depends on ISA_DMA_API && VIRT_TO_BUS |
308 | help | 307 | help |
309 | OSS is the Open Sound System suite of sound card drivers. They make | 308 | OSS is the Open Sound System suite of sound card drivers. They make |
310 | sound programming easier since they provide a common API. Say Y or | 309 | sound programming easier since they provide a common API. Say Y or |
@@ -312,16 +311,16 @@ config SOUND_OSS | |||
312 | driver for your sound card above, then pick your driver from the | 311 | driver for your sound card above, then pick your driver from the |
313 | list below. | 312 | list below. |
314 | 313 | ||
314 | if SOUND_OSS | ||
315 | |||
315 | config SOUND_TRACEINIT | 316 | config SOUND_TRACEINIT |
316 | bool "Verbose initialisation" | 317 | bool "Verbose initialisation" |
317 | depends on SOUND_OSS | ||
318 | help | 318 | help |
319 | Verbose soundcard initialization -- affects the format of autoprobe | 319 | Verbose soundcard initialization -- affects the format of autoprobe |
320 | and initialization messages at boot time. | 320 | and initialization messages at boot time. |
321 | 321 | ||
322 | config SOUND_DMAP | 322 | config SOUND_DMAP |
323 | bool "Persistent DMA buffers" | 323 | bool "Persistent DMA buffers" |
324 | depends on SOUND_OSS | ||
325 | ---help--- | 324 | ---help--- |
326 | Linux can often have problems allocating DMA buffers for ISA sound | 325 | Linux can often have problems allocating DMA buffers for ISA sound |
327 | cards on machines with more than 16MB of RAM. This is because ISA | 326 | cards on machines with more than 16MB of RAM. This is because ISA |
@@ -338,8 +337,6 @@ config SOUND_DMAP | |||
338 | 337 | ||
339 | config SOUND_SSCAPE | 338 | config SOUND_SSCAPE |
340 | tristate "Ensoniq SoundScape support" | 339 | tristate "Ensoniq SoundScape support" |
341 | depends on SOUND_OSS | ||
342 | depends on VIRT_TO_BUS | ||
343 | help | 340 | help |
344 | Answer Y if you have a sound card based on the Ensoniq SoundScape | 341 | Answer Y if you have a sound card based on the Ensoniq SoundScape |
345 | chipset. Such cards are being manufactured at least by Ensoniq, Spea | 342 | chipset. Such cards are being manufactured at least by Ensoniq, Spea |
@@ -352,13 +349,11 @@ config SOUND_SSCAPE | |||
352 | 349 | ||
353 | config SOUND_VMIDI | 350 | config SOUND_VMIDI |
354 | tristate "Loopback MIDI device support" | 351 | tristate "Loopback MIDI device support" |
355 | depends on SOUND_OSS | ||
356 | help | 352 | help |
357 | Support for MIDI loopback on port 1 or 2. | 353 | Support for MIDI loopback on port 1 or 2. |
358 | 354 | ||
359 | config SOUND_TRIX | 355 | config SOUND_TRIX |
360 | tristate "MediaTrix AudioTrix Pro support" | 356 | tristate "MediaTrix AudioTrix Pro support" |
361 | depends on SOUND_OSS | ||
362 | help | 357 | help |
363 | Answer Y if you have the AudioTriX Pro sound card manufactured | 358 | Answer Y if you have the AudioTriX Pro sound card manufactured |
364 | by MediaTrix. | 359 | by MediaTrix. |
@@ -382,7 +377,6 @@ config TRIX_BOOT_FILE | |||
382 | 377 | ||
383 | config SOUND_MSS | 378 | config SOUND_MSS |
384 | tristate "Microsoft Sound System support" | 379 | tristate "Microsoft Sound System support" |
385 | depends on SOUND_OSS | ||
386 | ---help--- | 380 | ---help--- |
387 | Again think carefully before answering Y to this question. It's | 381 | Again think carefully before answering Y to this question. It's |
388 | safe to answer Y if you have the original Windows Sound System card | 382 | safe to answer Y if you have the original Windows Sound System card |
@@ -414,7 +408,6 @@ config SOUND_MSS | |||
414 | 408 | ||
415 | config SOUND_MPU401 | 409 | config SOUND_MPU401 |
416 | tristate "MPU-401 support (NOT for SB16)" | 410 | tristate "MPU-401 support (NOT for SB16)" |
417 | depends on SOUND_OSS | ||
418 | ---help--- | 411 | ---help--- |
419 | Be careful with this question. The MPU401 interface is supported by | 412 | Be careful with this question. The MPU401 interface is supported by |
420 | all sound cards. However, some natively supported cards have their | 413 | all sound cards. However, some natively supported cards have their |
@@ -430,7 +423,6 @@ config SOUND_MPU401 | |||
430 | 423 | ||
431 | config SOUND_PAS | 424 | config SOUND_PAS |
432 | tristate "ProAudioSpectrum 16 support" | 425 | tristate "ProAudioSpectrum 16 support" |
433 | depends on SOUND_OSS | ||
434 | ---help--- | 426 | ---help--- |
435 | Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio | 427 | Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio |
436 | 16 or Logitech SoundMan 16 sound card. Answer N if you have some | 428 | 16 or Logitech SoundMan 16 sound card. Answer N if you have some |
@@ -452,7 +444,6 @@ config PAS_JOYSTICK | |||
452 | 444 | ||
453 | config SOUND_PSS | 445 | config SOUND_PSS |
454 | tristate "PSS (AD1848, ADSP-2115, ESC614) support" | 446 | tristate "PSS (AD1848, ADSP-2115, ESC614) support" |
455 | depends on SOUND_OSS | ||
456 | help | 447 | help |
457 | Answer Y or M if you have an Orchid SW32, Cardinal DSP16, Beethoven | 448 | Answer Y or M if you have an Orchid SW32, Cardinal DSP16, Beethoven |
458 | ADSP-16 or some other card based on the PSS chipset (AD1848 codec + | 449 | ADSP-16 or some other card based on the PSS chipset (AD1848 codec + |
@@ -495,7 +486,6 @@ config PSS_BOOT_FILE | |||
495 | 486 | ||
496 | config SOUND_SB | 487 | config SOUND_SB |
497 | tristate "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support" | 488 | tristate "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support" |
498 | depends on SOUND_OSS | ||
499 | ---help--- | 489 | ---help--- |
500 | Answer Y if you have an original Sound Blaster card made by Creative | 490 | Answer Y if you have an original Sound Blaster card made by Creative |
501 | Labs or a 100% hardware compatible clone (like the Thunderboard or | 491 | Labs or a 100% hardware compatible clone (like the Thunderboard or |
@@ -522,7 +512,6 @@ config SOUND_SB | |||
522 | 512 | ||
523 | config SOUND_YM3812 | 513 | config SOUND_YM3812 |
524 | tristate "Yamaha FM synthesizer (YM3812/OPL-3) support" | 514 | tristate "Yamaha FM synthesizer (YM3812/OPL-3) support" |
525 | depends on SOUND_OSS | ||
526 | ---help--- | 515 | ---help--- |
527 | Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4). | 516 | Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4). |
528 | Answering Y is usually a safe and recommended choice, however some | 517 | Answering Y is usually a safe and recommended choice, however some |
@@ -538,7 +527,6 @@ config SOUND_YM3812 | |||
538 | 527 | ||
539 | config SOUND_UART6850 | 528 | config SOUND_UART6850 |
540 | tristate "6850 UART support" | 529 | tristate "6850 UART support" |
541 | depends on SOUND_OSS | ||
542 | help | 530 | help |
543 | This option enables support for MIDI interfaces based on the 6850 | 531 | This option enables support for MIDI interfaces based on the 6850 |
544 | UART chip. This interface is rarely found on sound cards. It's safe | 532 | UART chip. This interface is rarely found on sound cards. It's safe |
@@ -549,7 +537,6 @@ config SOUND_UART6850 | |||
549 | 537 | ||
550 | config SOUND_AEDSP16 | 538 | config SOUND_AEDSP16 |
551 | tristate "Gallant Audio Cards (SC-6000 and SC-6600 based)" | 539 | tristate "Gallant Audio Cards (SC-6000 and SC-6600 based)" |
552 | depends on SOUND_OSS | ||
553 | ---help--- | 540 | ---help--- |
554 | Answer Y if you have a Gallant's Audio Excel DSP 16 card. This | 541 | Answer Y if you have a Gallant's Audio Excel DSP 16 card. This |
555 | driver supports Audio Excel DSP 16 but not the III nor PnP versions | 542 | driver supports Audio Excel DSP 16 but not the III nor PnP versions |
@@ -630,14 +617,14 @@ endchoice | |||
630 | 617 | ||
631 | config SOUND_VIDC | 618 | config SOUND_VIDC |
632 | tristate "VIDC 16-bit sound" | 619 | tristate "VIDC 16-bit sound" |
633 | depends on ARM && (ARCH_ACORN || ARCH_CLPS7500) && SOUND_OSS | 620 | depends on ARM && (ARCH_ACORN || ARCH_CLPS7500) |
634 | help | 621 | help |
635 | 16-bit support for the VIDC onboard sound hardware found on Acorn | 622 | 16-bit support for the VIDC onboard sound hardware found on Acorn |
636 | machines. | 623 | machines. |
637 | 624 | ||
638 | config SOUND_WAVEARTIST | 625 | config SOUND_WAVEARTIST |
639 | tristate "Netwinder WaveArtist" | 626 | tristate "Netwinder WaveArtist" |
640 | depends on ARM && SOUND_OSS && ARCH_NETWINDER | 627 | depends on ARM && ARCH_NETWINDER |
641 | help | 628 | help |
642 | Say Y here to include support for the Rockwell WaveArtist sound | 629 | Say Y here to include support for the Rockwell WaveArtist sound |
643 | system. This driver is mainly for the NetWinder. | 630 | system. This driver is mainly for the NetWinder. |
@@ -646,9 +633,11 @@ config SOUND_KAHLUA | |||
646 | tristate "XpressAudio Sound Blaster emulation" | 633 | tristate "XpressAudio Sound Blaster emulation" |
647 | depends on SOUND_SB | 634 | depends on SOUND_SB |
648 | 635 | ||
636 | endif # SOUND_OSS | ||
637 | |||
649 | config SOUND_SH_DAC_AUDIO | 638 | config SOUND_SH_DAC_AUDIO |
650 | tristate "SuperH DAC audio support" | 639 | tristate "SuperH DAC audio support" |
651 | depends on SOUND_PRIME && CPU_SH3 | 640 | depends on CPU_SH3 |
652 | 641 | ||
653 | config SOUND_SH_DAC_AUDIO_CHANNEL | 642 | config SOUND_SH_DAC_AUDIO_CHANNEL |
654 | int "DAC channel" | 643 | int "DAC channel" |