diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /drivers/sound | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/sound_core.c | 4 | ||||
| -rw-r--r-- | drivers/sound/soundcard.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sound/sound_core.c b/drivers/sound/sound_core.c index da0cfe51c..9ec821b91 100644 --- a/drivers/sound/sound_core.c +++ b/drivers/sound/sound_core.c @@ -175,9 +175,9 @@ static int sound_insert_unit(struct sound_unit **list, struct file_operations *f sprintf (name_buf, "%s", name); else sprintf (name_buf, "%s%d", name, (r - low) / SOUND_STEP); - s->de = devfs_register (devfs_handle, name_buf, 0, + s->de = devfs_register (devfs_handle, name_buf, DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor, - S_IFCHR | mode, 0, 0, fops, NULL); + S_IFCHR | mode, fops, NULL); return r; } diff --git a/drivers/sound/soundcard.c b/drivers/sound/soundcard.c index 5018ad1e7..aa7b82280 100644 --- a/drivers/sound/soundcard.c +++ b/drivers/sound/soundcard.c @@ -565,9 +565,9 @@ static void soundcard_register_devfs (int do_register) for (j = 0; j < num || j == 0; j++) { soundcard_make_name (name_buf, dev_list[i].name, j); if (do_register) - devfs_register (NULL, name_buf, 0, DEVFS_FL_NONE, + devfs_register (NULL, name_buf, DEVFS_FL_NONE, SOUND_MAJOR, dev_list[i].minor+ (j* 0x10), - S_IFCHR | dev_list[i].mode, 0, 0, + S_IFCHR | dev_list[i].mode, &oss_sound_fops, NULL); else { devfs_handle_t de; |