From dfdf34bbcbb2687d3a5fa723279124df9e309195 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Fri, 5 Sep 2008 09:16:38 +0200 Subject: 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: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/oss/Kconfig | 28 ---------------------------- sound/oss/aedsp16.c | 8 -------- 2 files changed, 36 deletions(-) (limited to 'sound/oss') diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index cbee9dca12b0..1ca7427c4b6d 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -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=,,,,," to the kernel - command line. - -endchoice - config SOUND_VIDC tristate "VIDC 16-bit sound" depends on ARM && (ARCH_ACORN || ARCH_CLPS7500) diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c index 51e1fde62e8d..a0274f3dac08 100644 --- a/sound/oss/aedsp16.c +++ b/sound/oss/aedsp16.c @@ -28,14 +28,6 @@ #include #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 -- cgit v1.2.3-59-g8ed1b