From: Clemens Ladisch <clemens@ladisch.de>
Date: Thu, 18 Nov 2010 08:53:54 +0000 (+0100)
Subject: ALSA: timer: automatically load the high-resolution timer
X-Git-Tag: v2.6.38-rc1~236^2~2^2~54
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=109fef9edcc100952eec980acbc2e1295627fbab;p=~emulex%2Finfiniband.git

ALSA: timer: automatically load the high-resolution timer

Increase the default timer limit so that snd-hrtimer.ko can be
automatically loaded when needed, e.g., when used as the default
sequencer timer.  This replaces the check for the obsolete
CONFIG_SND_HPET.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 13afb60999b..b3aaa600dcc 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -34,8 +34,8 @@
 #include <sound/initval.h>
 #include <linux/kmod.h>
 
-#if defined(CONFIG_SND_HPET) || defined(CONFIG_SND_HPET_MODULE)
-#define DEFAULT_TIMER_LIMIT 3
+#if defined(CONFIG_SND_HRTIMER) || defined(CONFIG_SND_HRTIMER_MODULE)
+#define DEFAULT_TIMER_LIMIT 4
 #elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE)
 #define DEFAULT_TIMER_LIMIT 2
 #else