diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:32 +0100 |
| commit | 9649745c8670eacc671e9cff72c5c1e346e13036 (patch) | |
| tree | 4c2db2aa5e524293269dfea5e4bd15bdea81ee6b /sound/core/seq/seq.c | |
| parent | a9c3c7e04b9a744eafb2e87c770e7300bbffa375 (diff) | |
| parent | 5e03c54eeb016cf1b066e9e48d30116814ca2459 (diff) | |
Merge branch 'topic/snd-hrtimer' into to-push
Diffstat (limited to 'sound/core/seq/seq.c')
| -rw-r--r-- | sound/core/seq/seq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c index ee0f8405ab3..bf09a5ad186 100644 --- a/sound/core/seq/seq.c +++ b/sound/core/seq/seq.c @@ -43,7 +43,9 @@ int seq_default_timer_class = SNDRV_TIMER_CLASS_GLOBAL; int seq_default_timer_sclass = SNDRV_TIMER_SCLASS_NONE; int seq_default_timer_card = -1; int seq_default_timer_device = -#ifdef CONFIG_SND_SEQ_RTCTIMER_DEFAULT +#ifdef CONFIG_SND_SEQ_HRTIMER_DEFAULT + SNDRV_TIMER_GLOBAL_HRTIMER +#elif defined(CONFIG_SND_SEQ_RTCTIMER_DEFAULT) SNDRV_TIMER_GLOBAL_RTC #else SNDRV_TIMER_GLOBAL_SYSTEM |