diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/sound/opl3.c | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'drivers/sound/opl3.c')
-rw-r--r-- | drivers/sound/opl3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/sound/opl3.c b/drivers/sound/opl3.c index 8898c655a..295ccfa17 100644 --- a/drivers/sound/opl3.c +++ b/drivers/sound/opl3.c @@ -32,8 +32,6 @@ #include "sound_config.h" #include "soundmodule.h" -#ifdef CONFIG_YM3812 - #include "opl3.h" #define MAX_VOICE 18 @@ -1218,10 +1216,10 @@ void cleanup_module(void) SOUND_LOCK_END; } +MODULE_PARM(io, "i"); + #endif EXPORT_SYMBOL(opl3_init); EXPORT_SYMBOL(opl3_detect); -MODULE_PARM(io, "i"); -#endif |