diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/sound/opl3sa.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/sound/opl3sa.c')
| -rw-r--r-- | drivers/sound/opl3sa.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/sound/opl3sa.c b/drivers/sound/opl3sa.c index 86fe07f10..8be3b91a9 100644 --- a/drivers/sound/opl3sa.c +++ b/drivers/sound/opl3sa.c @@ -1,5 +1,5 @@ /* - * sound/Xopl3sa.c + * sound/opl3sa.c * * Low level driver for Yamaha YMF701B aka OPL3-SA chip * @@ -19,10 +19,12 @@ */ #include <linux/config.h> +#include <linux/module.h> #undef SB_OK #include "sound_config.h" +#include "soundmodule.h" #ifdef SB_OK #include "sb.h" static int sb_initialized = 0; @@ -162,6 +164,7 @@ void attach_opl3sa_wss(struct address_info *hw_config) { int nm = num_mixers; + /* FIXME */ attach_ms_sound(hw_config); if (num_mixers > nm) /* A mixer was installed */ { @@ -293,6 +296,7 @@ MODULE_PARM(mpu_irq,"i"); struct address_info cfg; struct address_info mpu_cfg; +static int found_mpu; int init_module(void) { @@ -312,7 +316,7 @@ int init_module(void) if (probe_opl3sa_wss(&cfg) == 0) return -ENODEV; - found_mpu=probe_opl3_mpu(&mpu_cfg); + found_mpu=probe_opl3sa_mpu(&mpu_cfg); attach_opl3sa_wss(&cfg); if(found_mpu) @@ -325,7 +329,7 @@ void cleanup_module(void) { if(found_mpu) unload_opl3sa_mpu(&mpu_cfg); - unload_opl3sa(&cfg); + unload_opl3sa_wss(&cfg); SOUND_LOCK_END; } |