summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-11-18 09:53:54 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-22 08:14:31 +0100
commit109fef9edcc100952eec980acbc2e1295627fbab (patch)
tree1fc218ddd0da6a301ee8e940d9bf1df0532df107 /sound/core
parent47228e48aecdbec423a1275a5e27697d47f1f912 (diff)
downloadblackbird-op-linux-109fef9edcc100952eec980acbc2e1295627fbab.tar.gz
blackbird-op-linux-109fef9edcc100952eec980acbc2e1295627fbab.zip
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>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 13afb60999b9..b3aaa600dcc2 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
OpenPOWER on IntegriCloud