diff --git a/[refs] b/[refs] index 90c0ecb587d3..aaedbfc845aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd93fe4770ca607c7f39260c02941deccbd77b8b +refs/heads/master: 6e9059b05fa733045d7845ac70c5ba0a05e3c2d1 diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c index 3a2f8e2ca401..10a79aed33f8 100644 --- a/trunk/sound/core/timer.c +++ b/trunk/sound/core/timer.c @@ -959,7 +959,6 @@ int snd_timer_global_register(struct snd_timer *timer) struct snd_timer_system_private { struct timer_list tlist; - struct timer * timer; unsigned long last_expires; unsigned long last_jiffies; unsigned long correction;