aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-05-08 03:25:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:01 -0400
commit44171df8e944f0bc8f7fa3f6d080f3e671431989 (patch)
treebda436a860f40292e394920035b974fa5cb95c88 /sound
parentfedee54d8f12cdfde299f181fec5c62b0c647ad6 (diff)
the scheduled removal of OBSOLETE_OSS options
Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/Kconfig27
-rw-r--r--sound/oss/dmasound/Kconfig14
2 files changed, 0 insertions, 41 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 4c419300305d..dc57a13f6c39 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -5,20 +5,6 @@
5# 5#
6# Prompt user for primary drivers. 6# Prompt user for primary drivers.
7 7
8config OBSOLETE_OSS
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
22config SOUND_BT878 8config SOUND_BT878
23 tristate "BT878 audio dma" 9 tristate "BT878 audio dma"
24 depends on SOUND_PRIME && PCI 10 depends on SOUND_PRIME && PCI
@@ -45,19 +31,6 @@ config SOUND_BCM_CS4297A
45 note that CONFIG_KGDB should not be enabled at the same 31 note that CONFIG_KGDB should not be enabled at the same
46 time, since it also attempts to use this UART port. 32 time, since it also attempts to use this UART port.
47 33
48config SOUND_ES1371
49 tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
50 depends on SOUND_PRIME && PCI && OBSOLETE_OSS
51 help
52 Say Y or M if you have a PCI sound card utilizing the Ensoniq
53 ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
54 your sound card uses an ES1371 without removing your computer's
55 cover, use lspci -n and look for the PCI ID 1274:1371. Since
56 Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI
57 models are either ES1370 or ES1371 based. This driver differs
58 slightly from OSS/Free, so PLEASE READ
59 <file:Documentation/sound/oss/es1371>.
60
61config SOUND_ICH 34config SOUND_ICH
62 tristate "Intel ICH (i8xx) audio support" 35 tristate "Intel ICH (i8xx) audio support"
63 depends on SOUND_PRIME && PCI 36 depends on SOUND_PRIME && PCI
diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig
index 18e149f52a88..71b313479f83 100644
--- a/sound/oss/dmasound/Kconfig
+++ b/sound/oss/dmasound/Kconfig
@@ -12,20 +12,6 @@ config DMASOUND_ATARI
12 want). If you want to compile it as a module, say M here and read 12 want). If you want to compile it as a module, say M here and read
13 <file:Documentation/kbuild/modules.txt>. 13 <file:Documentation/kbuild/modules.txt>.
14 14
15config DMASOUND_PMAC
16 tristate "PowerMac DMA sound support"
17 depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS
18 select DMASOUND
19 help
20 If you want to use the internal audio of your PowerMac in Linux,
21 answer Y to this question. This will provide a Sun-like /dev/audio,
22 compatible with the Linux/i386 sound system. Otherwise, say N.
23
24 This driver is also available as a module ( = code which can be
25 inserted in and removed from the running kernel whenever you
26 want). If you want to compile it as a module, say M here and read
27 <file:Documentation/kbuild/modules.txt>.
28
29config DMASOUND_PAULA 15config DMASOUND_PAULA
30 tristate "Amiga DMA sound support" 16 tristate "Amiga DMA sound support"
31 depends on (AMIGA || APUS) && SOUND 17 depends on (AMIGA || APUS) && SOUND