diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/sound/sequencer.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/sound/sequencer.c')
| -rw-r--r-- | drivers/sound/sequencer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/sound/sequencer.c b/drivers/sound/sequencer.c index b5cb59cdf..44207cb62 100644 --- a/drivers/sound/sequencer.c +++ b/drivers/sound/sequencer.c @@ -16,9 +16,7 @@ */ #include <linux/config.h> -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #define SEQUENCER_C @@ -82,7 +80,7 @@ static volatile int iqhead = 0, iqtail = 0, iqlen = 0; static volatile int seq_playing = 0; static volatile int sequencer_busy = 0; static int output_threshold; -static int pre_event_timeout; +static long pre_event_timeout; static unsigned synth_open_mask; static int seq_queue(unsigned char *note, char nonblock); @@ -998,10 +996,8 @@ int sequencer_open(int dev, struct file *file) if (dev) /* Patch manager device (obsolete) */ return -ENXIO; -#ifdef CONFIG_KMOD if(synth_devs[dev] == NULL) request_module("synth0"); -#endif if (mode == OPEN_READ) { |