diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-11-18 03:53:54 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-22 02:14:31 -0500 |
| commit | 109fef9edcc100952eec980acbc2e1295627fbab (patch) | |
| tree | 1fc218ddd0da6a301ee8e940d9bf1df0532df107 | |
| parent | 47228e48aecdbec423a1275a5e27697d47f1f912 (diff) | |
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>
| -rw-r--r-- | sound/core/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 34 | #include <sound/initval.h> | 34 | #include <sound/initval.h> |
| 35 | #include <linux/kmod.h> | 35 | #include <linux/kmod.h> |
| 36 | 36 | ||
| 37 | #if defined(CONFIG_SND_HPET) || defined(CONFIG_SND_HPET_MODULE) | 37 | #if defined(CONFIG_SND_HRTIMER) || defined(CONFIG_SND_HRTIMER_MODULE) |
| 38 | #define DEFAULT_TIMER_LIMIT 3 | 38 | #define DEFAULT_TIMER_LIMIT 4 |
| 39 | #elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE) | 39 | #elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE) |
| 40 | #define DEFAULT_TIMER_LIMIT 2 | 40 | #define DEFAULT_TIMER_LIMIT 2 |
| 41 | #else | 41 | #else |