summaryrefslogtreecommitdiffstats
path: root/drivers/sound/sb_midi.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /drivers/sound/sb_midi.c
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'drivers/sound/sb_midi.c')
-rw-r--r--drivers/sound/sb_midi.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/sound/sb_midi.c b/drivers/sound/sb_midi.c
index 31a299a96..9c3cef2bb 100644
--- a/drivers/sound/sb_midi.c
+++ b/drivers/sound/sb_midi.c
@@ -14,9 +14,6 @@
#include <linux/config.h>
#include "sound_config.h"
-#ifdef CONFIG_SBDSP
-#ifdef CONFIG_MIDI
-
#include "sb.h"
#undef SB_TEST_IRQ
@@ -210,6 +207,3 @@ void sb_dsp_midi_init(sb_devc * devc)
midi_devs[dev]->converter->id = "SBMIDI";
sequencer_init();
}
-
-#endif
-#endif