summaryrefslogtreecommitdiffstats
path: root/kernel/sound/core/seq/oss/seq_oss.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/core/seq/oss/seq_oss.c')
-rw-r--r--kernel/sound/core/seq/oss/seq_oss.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sound/core/seq/oss/seq_oss.c b/kernel/sound/core/seq/oss/seq_oss.c
index 72873a46a..cb2389910 100644
--- a/kernel/sound/core/seq/oss/seq_oss.c
+++ b/kernel/sound/core/seq/oss/seq_oss.c
@@ -45,7 +45,7 @@ MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC);
*/
static int register_device(void);
static void unregister_device(void);
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
static int register_proc(void);
static void unregister_proc(void);
#else
@@ -148,8 +148,6 @@ odev_release(struct inode *inode, struct file *file)
if ((dp = file->private_data) == NULL)
return 0;
- snd_seq_oss_drain_write(dp);
-
mutex_lock(&register_mutex);
snd_seq_oss_release(dp);
mutex_unlock(&register_mutex);
@@ -261,7 +259,7 @@ unregister_device(void)
* /proc interface
*/
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
static struct snd_info_entry *info_entry;
@@ -303,4 +301,4 @@ unregister_proc(void)
snd_info_free_entry(info_entry);
info_entry = NULL;
}
-#endif /* CONFIG_PROC_FS */
+#endif /* CONFIG_SND_PROC_FS */