Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / include / sound / timer.h

diff --git a/include/sound/timer.h b/include/sound/timer.h
index 7990469..b0489b8 100644 (file)
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -90,6 +90,8 @@ struct snd_timer {
        struct list_head ack_list_head;
        struct list_head sack_list_head; /* slow ack list head */
        struct tasklet_struct task_queue;
+       int max_instances;      /* upper limit of timer instances */
+       int num_instances;      /* current number of timer instances */
 };
 
 struct snd_timer_instance {