aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 05:40:32 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-25 05:40:32 -0500
commit9649745c8670eacc671e9cff72c5c1e346e13036 (patch)
tree4c2db2aa5e524293269dfea5e4bd15bdea81ee6b /include/sound
parenta9c3c7e04b9a744eafb2e87c770e7300bbffa375 (diff)
parent5e03c54eeb016cf1b066e9e48d30116814ca2459 (diff)
Merge branch 'topic/snd-hrtimer' into to-push
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/asound.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 2c4dc908a54a..1c02ed1d7c4a 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -575,6 +575,7 @@ enum {
575#define SNDRV_TIMER_GLOBAL_SYSTEM 0 575#define SNDRV_TIMER_GLOBAL_SYSTEM 0
576#define SNDRV_TIMER_GLOBAL_RTC 1 576#define SNDRV_TIMER_GLOBAL_RTC 1
577#define SNDRV_TIMER_GLOBAL_HPET 2 577#define SNDRV_TIMER_GLOBAL_HPET 2
578#define SNDRV_TIMER_GLOBAL_HRTIMER 3
578 579
579/* info flags */ 580/* info flags */
580#define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */ 581#define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */