aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r--sound/core/timer.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 6aad411dd7b8..a7bcb04263cb 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1924,12 +1924,6 @@ static struct file_operations snd_timer_f_ops =
1924 .fasync = snd_timer_user_fasync, 1924 .fasync = snd_timer_user_fasync,
1925}; 1925};
1926 1926
1927static struct snd_minor snd_timer_reg =
1928{
1929 .comment = "timer",
1930 .f_ops = &snd_timer_f_ops,
1931};
1932
1933/* 1927/*
1934 * ENTRY functions 1928 * ENTRY functions
1935 */ 1929 */
@@ -1959,7 +1953,7 @@ static int __init alsa_timer_init(void)
1959 snd_printk(KERN_ERR "unable to register system timer (%i)\n", 1953 snd_printk(KERN_ERR "unable to register system timer (%i)\n",
1960 err); 1954 err);
1961 if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, 1955 if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER,
1962 NULL, 0, &snd_timer_reg, "timer"))<0) 1956 NULL, 0, &snd_timer_f_ops, "timer")) < 0)
1963 snd_printk(KERN_ERR "unable to register timer device (%i)\n", 1957 snd_printk(KERN_ERR "unable to register timer device (%i)\n",
1964 err); 1958 err);
1965 return 0; 1959 return 0;