diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/isa/wavefront/wavefront_midi.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 f14a7c0b699..65329f3abc3 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 |