aboutsummaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2008-09-05 09:16:38 +0200
committerJaroslav Kysela <perex@perex.cz>2008-09-09 09:11:01 +0200
commitdfdf34bbcbb2687d3a5fa723279124df9e309195 (patch)
tree242547134e1c73404d8e843669087da847de3887 /sound/oss
parentdc0abf90059292da831fb43e55b833d7c7a9e2a6 (diff)
downloadlinux-linaro-stable-dfdf34bbcbb2687d3a5fa723279124df9e309195.tar.gz
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 <rpjday@crashcourse.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/Kconfig28
-rw-r--r--sound/oss/aedsp16.c8
2 files changed, 0 insertions, 36 deletions
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=<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)
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
@@ -29,14 +29,6 @@
#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