Merge branch 'topic/drop-l3' into for-linus
[linux-2.6.git] / sound / Kconfig
index 8ebf512..1eceb85 100644 (file)
@@ -28,6 +28,10 @@ menuconfig SOUND
 
 if SOUND
 
+config SOUND_OSS_CORE
+       bool
+       default n
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
@@ -56,6 +60,8 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+source "sound/atmel/Kconfig"
+
 source "sound/spi/Kconfig"
 
 source "sound/mips/Kconfig"
@@ -80,6 +86,7 @@ endif # SND
 
 menuconfig SOUND_PRIME
        tristate "Open Sound System (DEPRECATED)"
+       select SOUND_OSS_CORE
        help
          Say 'Y' or 'M' to enable Open Sound System drivers.