diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /drivers/sound/opl3sa.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'drivers/sound/opl3sa.c')
| -rw-r--r-- | drivers/sound/opl3sa.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/sound/opl3sa.c b/drivers/sound/opl3sa.c index 9e5fd5a6b..213a0a099 100644 --- a/drivers/sound/opl3sa.c +++ b/drivers/sound/opl3sa.c @@ -31,8 +31,6 @@ static int sb_initialized = 0; #endif -#ifdef CONFIG_OPL3SA1 - static int kilroy_was_here = 0; /* Don't detect twice */ static int mpu_initialized = 0; @@ -177,15 +175,12 @@ void attach_opl3sa_wss(struct address_info *hw_config) void attach_opl3sa_mpu(struct address_info *hw_config) { -#if defined(CONFIG_UART401) && defined(CONFIG_MIDI) hw_config->name = "OPL3-SA (MPU401)"; attach_uart401(hw_config); -#endif } int probe_opl3sa_mpu(struct address_info *hw_config) { -#if defined(CONFIG_UART401) && defined(CONFIG_MIDI) unsigned char conf; static signed char irq_bits[] = { -1, -1, -1, -1, -1, 1, -1, 2, -1, 3, 4 @@ -240,9 +235,6 @@ int probe_opl3sa_mpu(struct address_info *hw_config) mpu_initialized = 1; return probe_uart401(hw_config); -#else - return 0; -#endif } void unload_opl3sa_wss(struct address_info *hw_config) @@ -265,17 +257,13 @@ void unload_opl3sa_wss(struct address_info *hw_config) void unload_opl3sa_mpu(struct address_info *hw_config) { -#if defined(CONFIG_UART401) && defined(CONFIG_MIDI) unload_uart401(hw_config); -#endif } #ifdef SB_OK void unload_opl3sa_sb(struct address_info *hw_config) { -#ifdef CONFIG_SBDSP sb_dsp_unload(hw_config); -#endif } #endif @@ -334,6 +322,4 @@ void cleanup_module(void) SOUND_LOCK_END; } -#endif - -#endif +#endif /* MODULE */ |