Merge branch 'topic/snd-hrtimer' into to-push

This commit is contained in:
Takashi Iwai 2008-12-25 11:40:32 +01:00
commit 9649745c86
5 changed files with 182 additions and 1 deletions

View file

@ -575,6 +575,7 @@ enum {
#define SNDRV_TIMER_GLOBAL_SYSTEM 0
#define SNDRV_TIMER_GLOBAL_RTC 1
#define SNDRV_TIMER_GLOBAL_HPET 2
#define SNDRV_TIMER_GLOBAL_HRTIMER 3
/* info flags */
#define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */