diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/sound/wf_midi.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/sound/wf_midi.c')
| -rw-r--r-- | drivers/sound/wf_midi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/sound/wf_midi.c b/drivers/sound/wf_midi.c index a8c6fc829..45db0f8b1 100644 --- a/drivers/sound/wf_midi.c +++ b/drivers/sound/wf_midi.c @@ -803,7 +803,7 @@ virtual_midi_disable (void) return 0; } -__initfunc (static int detect_wf_mpu (int irq, int io_base)) +static int __init detect_wf_mpu (int irq, int io_base) { if (check_region (io_base, 2)) { @@ -820,8 +820,7 @@ __initfunc (static int detect_wf_mpu (int irq, int io_base)) return 0; } -__initfunc (int install_wf_mpu (void)) - +int __init install_wf_mpu (void) { if ((phys_dev->devno = sound_alloc_mididev()) < 0){ |