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/sequencer.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'drivers/sound/sequencer.c')
| -rw-r--r-- | drivers/sound/sequencer.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/sound/sequencer.c b/drivers/sound/sequencer.c index 8fee21c6b..0ef3b67ad 100644 --- a/drivers/sound/sequencer.c +++ b/drivers/sound/sequencer.c @@ -15,15 +15,12 @@ * Alan Cox : reformatted and fixed a pair of null pointer bugs */ #include <linux/config.h> - #include <linux/kmod.h> - #define SEQUENCER_C #include "sound_config.h" - -#ifdef CONFIG_SEQUENCER #include "softoss.h" + int (*softsynthp) (int cmd, int parm1, int parm2, unsigned long parm3) = NULL; #include "midi_ctrl.h" @@ -719,9 +716,7 @@ static void seq_local_event(unsigned char *event_rec) switch (cmd) { case LOCL_STARTAUDIO: -#ifdef CONFIG_AUDIO DMAbuf_start_devices(parm); -#endif break; default: @@ -1692,9 +1687,7 @@ void sequencer_init(void) if (sequencer_ok) return; -#ifdef CONFIG_MIDI MIDIbuf_init(); -#endif queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ); if (queue == NULL) { @@ -1724,5 +1717,3 @@ void sequencer_unload(void) iqueue=NULL; } } - -#endif |