Merge branch 'master' of /home/sam/kernel/linux-2.6/

[linux-2.6] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index e37eab74572dbf7ea406a1339da0c2599634a4a3..78199f58b93a7daf6fc9a53e5f7b1190d977b71a 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1061,7 +1061,6 @@ static int snd_timer_register_system(void)
 static void snd_timer_proc_read(struct snd_info_entry *entry,
                                struct snd_info_buffer *buffer)
 {
-       unsigned long flags;
        struct snd_timer *timer;
        struct snd_timer_instance *ti;
        struct list_head *p, *q;
@@ -1107,7 +1106,7 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,
        mutex_unlock(&register_mutex);
 }
 
-static struct snd_info_entry *snd_timer_proc_entry = NULL;
+static struct snd_info_entry *snd_timer_proc_entry;
 
 static void __init snd_timer_proc_init(void)
 {