Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[sfrench/cifs-2.6.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index a0588c21324ac6ae98fbfccbf286139c1a97d582..4b30ae6d8ba511e4694c03d7322b05ad75a723d2 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -5,9 +5,22 @@
 #
 # Prompt user for primary drivers.
 
+config OSS_OBSOLETE
+       bool "Obsolete OSS drivers"
+       depends on SOUND_PRIME
+       help
+         This option enables support for obsolete OSS drivers that
+         are scheduled for removal in the near future.
+
+         Please contact Adrian Bunk <bunk@stusta.de> if you had to
+         say Y here because your hardware is not properly supported
+         by ALSA.
+
+         If unsure, say N.
+
 config SOUND_BT878
        tristate "BT878 audio dma"
-       depends on SOUND_PRIME && PCI
+       depends on SOUND_PRIME && PCI && OSS_OBSOLETE
        ---help---
          Audio DMA support for bt878 based grabber boards.  As you might have
          already noticed, bt878 is listed with two functions in /proc/pci.
@@ -31,22 +44,9 @@ config SOUND_BCM_CS4297A
          note that CONFIG_KGDB should not be enabled at the same
          time, since it also attempts to use this UART port.
 
-config SOUND_ES1371
-       tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-       depends on SOUND_PRIME && PCI
-       help
-         Say Y or M if you have a PCI sound card utilizing the Ensoniq
-         ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
-         your sound card uses an ES1371 without removing your computer's
-         cover, use lspci -n and look for the PCI ID 1274:1371. Since
-         Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI
-         models are either ES1370 or ES1371 based. This driver differs
-         slightly from OSS/Free, so PLEASE READ
-         <file:Documentation/sound/oss/es1371>.
-
 config SOUND_ICH
        tristate "Intel ICH (i8xx) audio support"
-       depends on SOUND_PRIME && PCI
+       depends on SOUND_PRIME && PCI && OSS_OBSOLETE
        help
          Support for integral audio in Intel's I/O Controller Hub (ICH)
          chipset, as used on the 810/820/840 motherboards.
@@ -348,7 +348,7 @@ config MSND_FIFOSIZE
 
 config SOUND_VIA82CXXX
        tristate "VIA 82C686 Audio Codec"
-       depends on SOUND_PRIME && PCI
+       depends on SOUND_PRIME && PCI && OSS_OBSOLETE
        help
          Say Y here to include support for the audio codec found on VIA
          82Cxxx-based chips. Typically these are built into a motherboard.
@@ -402,7 +402,7 @@ config SOUND_DMAP
 
 config SOUND_CS4232
        tristate "Crystal CS4232 based (PnP) cards"
-       depends on SOUND_OSS
+       depends on SOUND_OSS && OSS_OBSOLETE
        help
          Say Y here if you have a card based on the Crystal CS4232 chip set,
          which uses its own Plug and Play protocol.
@@ -705,18 +705,6 @@ config AEDSP16_SBPRO
 
 endchoice
 
-config AEDSP16_MPU401
-       bool "Audio Excel DSP 16 (MPU401 emulation)"
-       depends on SOUND_AEDSP16 && SOUND_MPU401
-       help
-         Answer Y if you want your audio card to emulate the MPU-401 midi
-         interface. You should then also say Y to "MPU-401 support".
-
-         Note that the I/O base for MPU-401 support of aedsp16 is the same
-         you have selected for "MPU-401 support". If you are using this
-         driver as a module you have to specify the MPU I/O base address with
-         the parameter 'mpu_base=0xNNN'.
-
 config SOUND_VIDC
        tristate "VIDC 16-bit sound"
        depends on ARM && (ARCH_ACORN || ARCH_CLPS7500) && SOUND_OSS
@@ -733,7 +721,7 @@ config SOUND_WAVEARTIST
 
 config SOUND_TVMIXER
        tristate "TV card (bt848) mixer support"
-       depends on SOUND_PRIME && I2C && VIDEO_V4L1
+       depends on SOUND_PRIME && I2C && VIDEO_V4L1 && OSS_OBSOLETE
        help
          Support for audio mixer facilities on the BT848 TV frame-grabber
          card.