summaryrefslogtreecommitdiffstats
path: root/drivers/sound/soundcard.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
commit03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch)
tree88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/sound/soundcard.c
parent257730f99381dd26e10b832fce4c94cae7ac1176 (diff)
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/sound/soundcard.c')
-rw-r--r--drivers/sound/soundcard.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/sound/soundcard.c b/drivers/sound/soundcard.c
index 2abd7fa22..1fbb368d8 100644
--- a/drivers/sound/soundcard.c
+++ b/drivers/sound/soundcard.c
@@ -769,6 +769,7 @@ struct file_operations oss_sound_fops =
sound_ioctl,
sound_mmap,
sound_open,
+ NULL, /* flush */
sound_release
};
@@ -846,12 +847,16 @@ static int sound[20] = {
#ifdef MODULE
+int traceinit = 0;
+MODULE_PARM(traceinit, "i");
+
int init_module(void)
{
int err;
int ints[21];
int i;
+ trace_init=traceinit;
/*
* "sound=" command line handling by Harald Milz.
*/