diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/isa/wavefront/wavefront_midi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/isa/wavefront/wavefront_midi.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_midi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c index f14a7c0b6998..65329f3abc30 100644 --- a/sound/isa/wavefront/wavefront_midi.c +++ b/sound/isa/wavefront/wavefront_midi.c | |||
| @@ -537,7 +537,7 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card) | |||
| 537 | } | 537 | } |
| 538 | 538 | ||
| 539 | /* Turn on Virtual MIDI, but first *always* turn it off, | 539 | /* Turn on Virtual MIDI, but first *always* turn it off, |
| 540 | since otherwise consectutive reloads of the driver will | 540 | since otherwise consecutive reloads of the driver will |
| 541 | never cause the hardware to generate the initial "internal" or | 541 | never cause the hardware to generate the initial "internal" or |
| 542 | "external" source bytes in the MIDI data stream. This | 542 | "external" source bytes in the MIDI data stream. This |
| 543 | is pretty important, since the internal hardware generally will | 543 | is pretty important, since the internal hardware generally will |