diff --git a/[refs] b/[refs] index 8ad3fee228c9..c0b993519440 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a501dfa3a763451dedd583eb90a6c9e90d0e3a3c +refs/heads/master: 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3 diff --git a/trunk/include/sound/asound.h b/trunk/include/sound/asound.h index 694b6e66efcb..8e552d627fa5 100644 --- a/trunk/include/sound/asound.h +++ b/trunk/include/sound/asound.h @@ -694,7 +694,7 @@ enum sndrv_timer_event { SNDRV_TIMER_EVENT_PAUSE, /* val = 0 */ SNDRV_TIMER_EVENT_EARLY, /* val = 0, early event */ SNDRV_TIMER_EVENT_SUSPEND, /* val = 0 */ - SNDRV_TIMER_EVENT_RESUME, /* val = 0 */ + SNDRV_TIMER_EVENT_RESUME, /* val = resolution in ns */ /* master timer events for slave timer instances */ SNDRV_TIMER_EVENT_MSTART = SNDRV_TIMER_EVENT_START + 10, SNDRV_TIMER_EVENT_MSTOP = SNDRV_TIMER_EVENT_STOP + 10,