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

Commit 7102ed51 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

remove the OSS trident driver 



SOUND_TRIDENT was the last PCI OSS driver, and since there's already an
ALSA driver for the same hardware we can remove it.

[muli@il.ibm.com: update CREDITS]
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33cba065

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -317,6 +317,14 @@ S: 2322 37th Ave SW 
S: Seattle, Washington 98126-2010

S: USA



N: Muli Ben-Yehuda

E: mulix@mulix.org

E: muli@il.ibm.com

W: http://www.mulix.org

D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU,

D: KVM and Xen bits and other misc. hackery.

S: Haifa, Israel



N: Johannes Berg

E: johannes@sipsolutions.net

W: http://johannes.sipsolutions.net/

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -4080,12 +4080,6 @@ W: http://www.prosec.rub.de/tpm/ 
L:	tpmdd-devel@lists.sourceforge.net

S:	Maintained



TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE

P:	Muli Ben-Yehuda

M:	mulix@mulix.org

L:	linux-kernel@vger.kernel.org

S:	Maintained



TRIVIAL PATCHES

P:	Jesper Juhl

M:	trivial@kernel.org

sound/oss/Kconfig

+0 −41
Original line number Diff line number Diff line
@@ -35,47 +35,6 @@ config SOUND_AU1550_AC97 
	tristate "Au1550/Au1200 AC97 Sound"

	depends on SOC_AU1550 || SOC_AU1200



config SOUND_TRIDENT

	tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"

	depends on PCI

	---help---

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

	  4DWave-DX/NX chipset or your mother board chipset has SiS 7018

	  or ALi 5451 built-in. The SiS 7018 PCI Audio Core is embedded

	  in SiS960 Super South Bridge and SiS540/630 Single Chipset.

	  The ALi 5451 PCI Audio Core is embedded in ALi M1535, M1535D,

	  M1535+ or M1535D+ South Bridge.



	  Use lspci -n to find out if your sound card or chipset uses

	  Trident 4DWave or SiS 7018. PCI ID 1023:2000 or 1023:2001 stands

	  for Trident 4Dwave. PCI ID 1039:7018 stands for SiS7018. PCI ID

	  10B9:5451 stands for ALi5451.



	  This driver supports S/PDIF in/out (record/playback) for ALi 5451

	  embedded in ALi M1535+ and M1535D+. Note that they aren't all

	  enabled by default; you can enable them by saying Y to "/proc file

	  system support" and "Sysctl support", and after the /proc file

	  system has been mounted, executing the command



		command			what is enabled



	  echo 0>/proc/ALi5451	pcm out is also set to S/PDIF out. (Default).



	  echo 1>/proc/ALi5451	use S/PDIF out to output pcm data.



	  echo 2>/proc/ALi5451	use S/PDIF out to output non-pcm data.

	  (AC3...).



	  echo 3>/proc/ALi5451	record from Ac97 in(MIC, Line in...).

	  (Default).



	  echo 4>/proc/ALi5451	no matter Ac97 settings, record from S/PDIF

	  in.





	  This driver differs slightly from OSS/Free, so PLEASE READ the

	  comments at the top of <file:sound/oss/trident.c>.



config SOUND_MSNDCLAS

	tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"

	depends on (m || !STANDALONE) && ISA

sound/oss/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ obj-$(CONFIG_SOUND_MSNDCLAS) += msnd.o msnd_classic.o 
obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o

obj-$(CONFIG_SOUND_VWSND)	+= vwsnd.o

obj-$(CONFIG_SOUND_AU1550_AC97)	+= au1550_ac97.o ac97_codec.o

obj-$(CONFIG_SOUND_TRIDENT)	+= trident.o ac97_codec.o

obj-$(CONFIG_SOUND_BCM_CS4297A)	+= swarm_cs4297a.o



obj-$(CONFIG_SOUND_WM97XX)	+= ac97_plugin_wm97xx.o

sound/oss/trident.c

deleted100644 → 0
+0 −4654

File deleted.

Preview size limit exceeded, changes collapsed.