Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

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

diff --git a/sound/Kconfig b/sound/Kconfig
index 8ebf512ced6caacee8f0f0a8aafa80772e530889..1eceb85287c5f8197a25fe4a326c25b5dbf8e5be 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -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.