Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 82718836f93726a0d2ec464117b759dc4aa28442..8efc1b12f3a8d8fc6309e61b350496a9a96305d0 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -73,6 +73,15 @@ config SND_PCM_OSS
          To compile this driver as a module, choose M here: the module
          will be called snd-pcm-oss.
 
+config SND_PCM_OSS_PLUGINS
+       bool "OSS PCM (digital audio) API - Include plugin system"
+       depends on SND_PCM_OSS
+        default y
+       help
+          If you disable this option, the ALSA's OSS PCM API will not
+          support conversion of channels, formats and rates. It will
+          behave like most of new OSS/Free drivers in 2.4/2.6 kernels.
+
 config SND_SEQUENCER_OSS
        bool "OSS Sequencer API"
        depends on SND && SND_SEQUENCER
@@ -83,8 +92,9 @@ config SND_SEQUENCER_OSS
 
          Many programs still use the OSS API, so say Y.
 
-         To compile this driver as a module, choose M here: the module
-         will be called snd-seq-oss.
+         If you choose M in "Sequencer support" (SND_SEQUENCER),
+         this will be compiled as a module. The module will be called
+         snd-seq-oss.
 
 config SND_RTCTIMER
        tristate "RTC Timer support"
@@ -111,6 +121,34 @@ config SND_SEQ_RTCTIMER_DEFAULT
 
          If in doubt, say Y.
 
+config SND_DYNAMIC_MINORS
+       bool "Dynamic device file minor numbers (EXPERIMENTAL)"
+       depends on SND && EXPERIMENTAL
+       help
+         If you say Y here, the minor numbers of ALSA device files in
+         /dev/snd/ are allocated dynamically.  This allows you to have
+         more than 8 sound cards, but requires a dynamic device file
+         system like udev.
+
+         If you are unsure about this, say N here.
+
+config SND_SUPPORT_OLD_API
+       bool "Support old ALSA API"
+       depends on SND
+       default y
+       help
+         Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3
+         or older).
+
+config SND_VERBOSE_PROCFS
+       bool "Verbose procfs contents"
+       depends on SND
+       default y
+       help
+         Say Y here to include code for verbose procfs contents (provides
+          usefull information to developers when a problem occurs). On the
+          other side, it makes the ALSA subsystem larger.
+
 config SND_VERBOSE_PRINTK
        bool "Verbose printk"
        depends on SND
@@ -133,7 +171,3 @@ config SND_DEBUG_DETECT
        help
          Say Y here to enable extra-verbose log messages printed when
          detecting devices.
-
-config SND_GENERIC_DRIVER
-       bool
-       depends on SND