microblaze: Checking DTS against PVR for write-back cache

[safe/jmp/linux-2.6] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 8ebf512..fcad760 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,6 +1,3 @@
-# sound/Config.in
-#
-

 menuconfig SOUND
        tristate "Sound card support"
        depends on HAS_IOMEM
 menuconfig SOUND
        tristate "Sound card support"
        depends on HAS_IOMEM


@@ -28,6 +25,38 @@ menuconfig SOUND
 
 if SOUND
 
 
 if SOUND
 

+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 unsure, say Y.
+

 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K


@@ -56,6 +85,8 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
 
 source "sound/arm/Kconfig"
 

+source "sound/atmel/Kconfig"
+

 source "sound/spi/Kconfig"
 
 source "sound/mips/Kconfig"
 source "sound/spi/Kconfig"
 
 source "sound/mips/Kconfig"


@@ -80,6 +111,7 @@ endif # SND
 
 menuconfig SOUND_PRIME
        tristate "Open Sound System (DEPRECATED)"
 
 menuconfig SOUND_PRIME
        tristate "Open Sound System (DEPRECATED)"

+       select SOUND_OSS_CORE

        help
          Say 'Y' or 'M' to enable Open Sound System drivers.
 
        help
          Say 'Y' or 'M' to enable Open Sound System drivers.
 


@@ -101,4 +133,3 @@ config AC97_BUS
          sound subsystem and other function drivers completely unrelated to
          sound although they're sharing the AC97 bus. Concerned drivers
          should "select" this.
          sound subsystem and other function drivers completely unrelated to
          sound although they're sharing the AC97 bus. Concerned drivers
          should "select" this.

-