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

Commit dfdf34bb authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Jaroslav Kysela
Browse files

sound: remove reference to dead sound OSS vars AEDSP16_MSS and SBPRO 



Remove the Kconfig definitions of unused variables AEDSP16_MSS and
AEDSP16_SBPRO since they're:

1) unused, and
2) referenced incorrectly anyway.

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent dc0abf90

sound/oss/Kconfig

+0 −28
Original line number Diff line number Diff line
@@ -539,34 +539,6 @@ config SC6600_CDROMBASE 
	  Base I/O port address for the CD-ROM interface of the Audio Excel

	  DSP 16 card.



choice

	prompt "Audio Excel DSP 16"

	optional

	depends on SOUND_AEDSP16



config AEDSP16_MSS

	bool "MSS emulation"

	depends on SOUND_MSS

	help

	  Answer Y if you want your audio card to emulate Microsoft Sound

	  System. You should then say Y to "Microsoft Sound System support"

	  and say N to "Audio Excel DSP 16 (SBPro emulation)".



config AEDSP16_SBPRO

	bool "SBPro emulation"

	depends on SOUND_SB

	help

	  Answer Y if you want your audio card to emulate Sound Blaster Pro.

	  You should then say Y to "100% Sound Blaster compatibles

	  (SB16/32/64, ESS, Jazz16) support" and N to "Audio Excel DSP 16 (MSS

	  emulation)".



	  If you compile the driver into the kernel, you have to add

	  "aedsp16=<io>,<irq>,<dma>,<mssio>,<mpuio>,<mouirq>" to the kernel

	  command line.



endchoice



config SOUND_VIDC

	tristate "VIDC 16-bit sound"

	depends on ARM && (ARCH_ACORN || ARCH_CLPS7500)

sound/oss/aedsp16.c

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
#include <linux/init.h>

#include "sound_config.h"



/*

 * Sanity checks

 */



#if defined(CONFIG_SOUND_AEDSP16_SBPRO) && defined(CONFIG_SOUND_AEDSP16_MSS)

#error You have to enable only one of the MSS and SBPRO emulations.

#endif



/*



   READ THIS