Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44171df8 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

the scheduled removal of OBSOLETE_OSS options 



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fedee54d

sound/oss/Kconfig

+0 −27
Original line number Diff line number Diff line
@@ -5,20 +5,6 @@ 
#

# Prompt user for primary drivers.



config OBSOLETE_OSS

	bool "Obsolete OSS drivers"

	depends on SOUND_PRIME

	help

	  This option enables support for obsolete OSS drivers that

	  are scheduled for removal in the near future since there

	  are ALSA drivers for the same hardware.



	  Please contact Adrian Bunk <bunk@stusta.de> if you had to

	  say Y here because your soundcard is not properly supported

	  by ALSA.



	  If unsure, say N.



config SOUND_BT878

	tristate "BT878 audio dma"

	depends on SOUND_PRIME && PCI
@@ -45,19 +31,6 @@ config SOUND_BCM_CS4297A 
	  note that CONFIG_KGDB should not be enabled at the same

	  time, since it also attempts to use this UART port.



config SOUND_ES1371

	tristate "Creative Ensoniq AudioPCI 97 (ES1371)"

	depends on SOUND_PRIME && PCI && OBSOLETE_OSS

	help

	  Say Y or M if you have a PCI sound card utilizing the Ensoniq

	  ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if

	  your sound card uses an ES1371 without removing your computer's

	  cover, use lspci -n and look for the PCI ID 1274:1371. Since

	  Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI

	  models are either ES1370 or ES1371 based. This driver differs

	  slightly from OSS/Free, so PLEASE READ

	  <file:Documentation/sound/oss/es1371>.



config SOUND_ICH

	tristate "Intel ICH (i8xx) audio support"

	depends on SOUND_PRIME && PCI

sound/oss/dmasound/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -12,20 +12,6 @@ config DMASOUND_ATARI 
	  want). If you want to compile it as a module, say M here and read

	  <file:Documentation/kbuild/modules.txt>.



config DMASOUND_PMAC

	tristate "PowerMac DMA sound support"

	depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS

 	select DMASOUND

	help

	  If you want to use the internal audio of your PowerMac in Linux,

	  answer Y to this question. This will provide a Sun-like /dev/audio,

	  compatible with the Linux/i386 sound system. Otherwise, say N.



	  This driver is also available as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you

	  want). If you want to compile it as a module, say M here and read

	  <file:Documentation/kbuild/modules.txt>.



config DMASOUND_PAULA

	tristate "Amiga DMA sound support"

	depends on (AMIGA || APUS) && SOUND