Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/

[linux-2.6] / include / sound / asound.h

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 694b6e66efcb2ece980840f8a36301e7318a49d3..8e552d627fa58629dce85cf3408e077f99f132b2 100644 (file)
--- a/include/sound/asound.h
+++ b/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,