/spare/repo/netdev-2.6 branch 'master'

1 files changed, 5 insertions, 1 deletions

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 9974f83cca44..8e552d627fa5 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -560,7 +560,7 @@ enum {
  *  Timer section - /dev/snd/timer
  */
 
-#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 4)
+#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 5)
 
 enum sndrv_timer_class {
         SNDRV_TIMER_CLASS_NONE = -1,
@@ -693,11 +693,15 @@ enum sndrv_timer_event {
         SNDRV_TIMER_EVENT_CONTINUE,             /* val = resolution in ns */
         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 = 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,
         SNDRV_TIMER_EVENT_MCONTINUE = SNDRV_TIMER_EVENT_CONTINUE + 10,
         SNDRV_TIMER_EVENT_MPAUSE = SNDRV_TIMER_EVENT_PAUSE + 10,
+        SNDRV_TIMER_EVENT_MSUSPEND = SNDRV_TIMER_EVENT_SUSPEND + 10,
+        SNDRV_TIMER_EVENT_MRESUME = SNDRV_TIMER_EVENT_RESUME + 10,
 };
 
 struct sndrv_timer_tread {