diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-17 07:05:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:10 -0400 |
commit | cf3a386c083c0cc4eb9f01a8818b9499ae56e73f (patch) | |
tree | 52a3514eea7c4f2abf47b4b475751190fc758ff5 /sound/oss | |
parent | 2e32725c6ae8fa5345d9d095742e175ff4badd3b (diff) |
remove options depending on OSS_OBSOLETE
This patch contains the scheduled removal of options depending on
OSS_OBSOLETE.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/Kconfig | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 314477909f82..866d4de8d4ab 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -5,35 +5,6 @@ | |||
5 | # | 5 | # |
6 | # Prompt user for primary drivers. | 6 | # Prompt user for primary drivers. |
7 | 7 | ||
8 | config OSS_OBSOLETE | ||
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. | ||
14 | |||
15 | Please contact Adrian Bunk <bunk@stusta.de> if you had to | ||
16 | say Y here because your hardware is not properly supported | ||
17 | by ALSA. | ||
18 | |||
19 | If unsure, say N. | ||
20 | |||
21 | config SOUND_BT878 | ||
22 | tristate "BT878 audio dma" | ||
23 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE | ||
24 | ---help--- | ||
25 | Audio DMA support for bt878 based grabber boards. As you might have | ||
26 | already noticed, bt878 is listed with two functions in /proc/pci. | ||
27 | Function 0 does the video stuff (bt848 compatible), function 1 does | ||
28 | the same for audio data. This is a driver for the audio part of | ||
29 | the chip. If you say 'Y' here you get a oss-compatible dsp device | ||
30 | where you can record from. If you want just watch TV you probably | ||
31 | don't need this driver as most TV cards handle sound with a short | ||
32 | cable from the TV card to your sound card's line-in. | ||
33 | |||
34 | To compile this driver as a module, choose M here: the module will | ||
35 | be called btaudio. | ||
36 | |||
37 | config SOUND_BCM_CS4297A | 8 | config SOUND_BCM_CS4297A |
38 | tristate "Crystal Sound CS4297a (for Swarm)" | 9 | tristate "Crystal Sound CS4297a (for Swarm)" |
39 | depends on SOUND_PRIME && SIBYTE_SWARM | 10 | depends on SOUND_PRIME && SIBYTE_SWARM |
@@ -44,13 +15,6 @@ config SOUND_BCM_CS4297A | |||
44 | note that CONFIG_KGDB should not be enabled at the same | 15 | note that CONFIG_KGDB should not be enabled at the same |
45 | time, since it also attempts to use this UART port. | 16 | time, since it also attempts to use this UART port. |
46 | 17 | ||
47 | config SOUND_ICH | ||
48 | tristate "Intel ICH (i8xx) audio support" | ||
49 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE | ||
50 | help | ||
51 | Support for integral audio in Intel's I/O Controller Hub (ICH) | ||
52 | chipset, as used on the 810/820/840 motherboards. | ||
53 | |||
54 | config SOUND_VWSND | 18 | config SOUND_VWSND |
55 | tristate "SGI Visual Workstation Sound" | 19 | tristate "SGI Visual Workstation Sound" |
56 | depends on SOUND_PRIME && X86_VISWS | 20 | depends on SOUND_PRIME && X86_VISWS |
@@ -346,26 +310,6 @@ config MSND_FIFOSIZE | |||
346 | and Pinnacle). Larger values reduce the chance of data overruns at | 310 | and Pinnacle). Larger values reduce the chance of data overruns at |
347 | the expense of overall latency. If unsure, use the default. | 311 | the expense of overall latency. If unsure, use the default. |
348 | 312 | ||
349 | config SOUND_VIA82CXXX | ||
350 | tristate "VIA 82C686 Audio Codec" | ||
351 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE && VIRT_TO_BUS | ||
352 | help | ||
353 | Say Y here to include support for the audio codec found on VIA | ||
354 | 82Cxxx-based chips. Typically these are built into a motherboard. | ||
355 | |||
356 | DO NOT select Sound Blaster or Adlib with this driver, unless | ||
357 | you have a Sound Blaster or Adlib card in addition to your VIA | ||
358 | audio chip. | ||
359 | |||
360 | config MIDI_VIA82CXXX | ||
361 | bool "VIA 82C686 MIDI" | ||
362 | depends on SOUND_VIA82CXXX && ISA_DMA_API | ||
363 | help | ||
364 | Answer Y to use the MIDI interface of the Via686. You may need to | ||
365 | enable this in the BIOS before it will work. This is for connection | ||
366 | to external MIDI hardware, and is not required for software playback | ||
367 | of MIDI files. | ||
368 | |||
369 | config SOUND_OSS | 313 | config SOUND_OSS |
370 | tristate "OSS sound modules" | 314 | tristate "OSS sound modules" |
371 | depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS | 315 | depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS |
@@ -400,20 +344,6 @@ config SOUND_DMAP | |||
400 | 344 | ||
401 | Say Y unless you have 16MB or more RAM or a PCI sound card. | 345 | Say Y unless you have 16MB or more RAM or a PCI sound card. |
402 | 346 | ||
403 | config SOUND_CS4232 | ||
404 | tristate "Crystal CS4232 based (PnP) cards" | ||
405 | depends on SOUND_OSS && OSS_OBSOLETE | ||
406 | help | ||
407 | Say Y here if you have a card based on the Crystal CS4232 chip set, | ||
408 | which uses its own Plug and Play protocol. | ||
409 | |||
410 | If you compile the driver into the kernel, you have to add | ||
411 | "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel | ||
412 | command line. | ||
413 | |||
414 | See <file:Documentation/sound/oss/CS4232> for more information on | ||
415 | configuring this card. | ||
416 | |||
417 | config SOUND_SSCAPE | 347 | config SOUND_SSCAPE |
418 | tristate "Ensoniq SoundScape support" | 348 | tristate "Ensoniq SoundScape support" |
419 | depends on SOUND_OSS | 349 | depends on SOUND_OSS |
@@ -720,13 +650,6 @@ config SOUND_WAVEARTIST | |||
720 | Say Y here to include support for the Rockwell WaveArtist sound | 650 | Say Y here to include support for the Rockwell WaveArtist sound |
721 | system. This driver is mainly for the NetWinder. | 651 | system. This driver is mainly for the NetWinder. |
722 | 652 | ||
723 | config SOUND_TVMIXER | ||
724 | tristate "TV card (bt848) mixer support" | ||
725 | depends on SOUND_PRIME && I2C && VIDEO_V4L1 && OSS_OBSOLETE | ||
726 | help | ||
727 | Support for audio mixer facilities on the BT848 TV frame-grabber | ||
728 | card. | ||
729 | |||
730 | config SOUND_KAHLUA | 653 | config SOUND_KAHLUA |
731 | tristate "XpressAudio Sound Blaster emulation" | 654 | tristate "XpressAudio Sound Blaster emulation" |
732 | depends on SOUND_SB | 655 | depends on SOUND_SB |