Merge branch 'devel' into next

[~andy/linux] / sound / core / Kconfig

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 91f91c5cdb4ee0974fb8173c64e0000ebb008731..7bbdda041a991a991f264b09959025dd2f298295 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -95,6 +95,26 @@ config SND_SEQUENCER_OSS
          this will be compiled as a module. The module will be called
          snd-seq-oss.
 
+config SND_HRTIMER
+       tristate "HR-timer backend support"
+       depends on HIGH_RES_TIMERS
+       select SND_TIMER
+       help
+         Say Y here to enable HR-timer backend for ALSA timer.  ALSA uses
+         the hrtimer as a precise timing source. The ALSA sequencer code
+         also can use this timing source.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-hrtimer.
+
+config SND_SEQ_HRTIMER_DEFAULT
+       bool "Use HR-timer as default sequencer timer"
+       depends on SND_HRTIMER && SND_SEQUENCER
+       default y
+       help
+         Say Y here to use the HR-timer backend as the default sequencer
+         timer.
+
 config SND_RTCTIMER
        tristate "RTC Timer support"
        depends on RTC
@@ -108,9 +128,13 @@ config SND_RTCTIMER
          To compile this driver as a module, choose M here: the module
          will be called snd-rtctimer.
 
+         Note that this option is exclusive with the new RTC drivers
+         (CONFIG_RTC_CLASS) since this requires the old API.
+
 config SND_SEQ_RTCTIMER_DEFAULT
        bool "Use RTC as default sequencer timer"
        depends on SND_RTCTIMER && SND_SEQUENCER
+       depends on !SND_SEQ_HRTIMER_DEFAULT
        default y
        help
          Say Y here to use the RTC timer as the default sequencer