Merge branch 'classmate' into release

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 406a450..475455c 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -5,6 +5,7 @@ config SND_TIMER
 config SND_PCM
        tristate
        select SND_TIMER
+       select GCD
 
 config SND_HWDEP
        tristate
@@ -134,7 +135,7 @@ config SND_RTCTIMER
 config SND_SEQ_RTCTIMER_DEFAULT
        bool "Use RTC as default sequencer timer"
        depends on SND_RTCTIMER && SND_SEQUENCER
-       dpeends on !SND_SEQ_HRTIMER_DEFAULT
+       depends on !SND_SEQ_HRTIMER_DEFAULT
        default y
        help
          Say Y here to use the RTC timer as the default sequencer
@@ -205,3 +206,9 @@ config SND_PCM_XRUN_DEBUG
 
 config SND_VMASTER
        bool
+
+config SND_DMA_SGBUF
+       def_bool y
+       depends on X86
+
+source "sound/core/seq/Kconfig"