[SCSI] export busy state via q->lld_busy_fn()

[linux-2.6-omap-h63xx.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index d4fafb6eec6caec2286999a541221d715b1f81db..1ca7427c4b6d869d48a19382c60949620ab178d1 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -24,13 +24,6 @@ config SOUND_VWSND
          <file:Documentation/sound/oss/vwsnd> for more info on this driver's
          capabilities.
 
-config SOUND_HAL2
-       tristate "SGI HAL2 sound (EXPERIMENTAL)"
-       depends on SGI_IP22 && EXPERIMENTAL
-       help
-         Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
-         use its on-board A2 audio system.
-
 config SOUND_AU1550_AC97
        tristate "Au1550/Au1200 AC97 Sound"
        depends on SOC_AU1550 || SOC_AU1200
@@ -546,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)