Merge branch 'topic/usb-audio' into for-linus

[pandora-kernel.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 1eceb85..439e15c 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -32,6 +32,34 @@ config SOUND_OSS_CORE
        bool
        default n
 
+config SOUND_OSS_CORE_PRECLAIM
+       bool "Preclaim OSS device numbers"
+       depends on SOUND_OSS_CORE
+       default y
+       help
+         With this option enabled, the kernel will claim all OSS device
+         numbers if any OSS support (native or emulation) is enabled
+         whether the respective module is loaded or not and try to load the
+         appropriate module using sound-slot/service-* and char-major-*
+         module aliases when one of the device numbers is opened.  With
+         this option disabled, kernel will only claim actually in-use
+         device numbers and opening a missing device will generate only the
+         standard char-major-* aliases.
+
+         The only visible difference is use of additional module aliases
+         and whether OSS sound devices appear multiple times in
+         /proc/devices.  sound-slot/service-* module aliases are scheduled
+         to be removed (ie. PRECLAIM won't be available) and this option is
+         to make the transition easier.  This option can be overridden
+         during boot using the kernel parameter soundcore.preclaim_oss.
+
+         Disabling this allows alternative OSS implementations.
+
+         Please read Documentation/feature-removal-schedule.txt for
+         details.
+
+         If unusre, say Y.
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K