diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/sbus/audio/audio.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/sbus/audio/audio.c')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index 62d295a8e..01c76073f 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -1,4 +1,4 @@ -/* $Id: audio.c,v 1.48 2000/02/09 22:33:19 davem Exp $ +/* $Id: audio.c,v 1.49 2000/02/17 05:52:41 davem Exp $ * drivers/sbus/audio/audio.c * * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu) @@ -32,6 +32,7 @@ #include <linux/init.h> #include <linux/soundcard.h> #include <linux/version.h> +#include <linux/devfs_fs_kernel.h> #include <asm/delay.h> #include <asm/pgtable.h> @@ -2198,9 +2199,8 @@ int __init sparcaudio_init(void) #endif /* Register our character device driver with the VFS. */ - if (register_chrdev(SOUND_MAJOR, "sparcaudio", &sparcaudio_fops)) + if (devfs_register_chrdev(SOUND_MAJOR, "sparcaudio", &sparcaudio_fops)) return -EIO; - #ifdef CONFIG_SPARCAUDIO_AMD7930 amd7930_init(); @@ -2221,7 +2221,7 @@ int __init sparcaudio_init(void) #ifdef MODULE void cleanup_module(void) { - unregister_chrdev(SOUND_MAJOR, "sparcaudio"); + devfs_unregister_chrdev(SOUND_MAJOR, "sparcaudio"); } #endif |