aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/v_midi.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-16 02:50:49 -0400
committerTakashi Iwai <tiwai@suse.de>2010-03-16 02:50:49 -0400
commita9104f989916aac5d92bfa2c51915d5985fb2e6c (patch)
tree17bef4eac561e3ac90d98d68190978e686712b67 /sound/oss/v_midi.h
parentad6cfc2ac71180171e090e69ae8762ac511884b1 (diff)
parent89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff)
Merge branch 'topic/misc' into fix/misc
Diffstat (limited to 'sound/oss/v_midi.h')
-rw-r--r--sound/oss/v_midi.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/oss/v_midi.h b/sound/oss/v_midi.h
index 1b86cb45c607..08e2185ee816 100644
--- a/sound/oss/v_midi.h
+++ b/sound/oss/v_midi.h
@@ -2,9 +2,9 @@ typedef struct vmidi_devc {
2 int dev; 2 int dev;
3 3
4 /* State variables */ 4 /* State variables */
5 int opened; 5 int opened;
6 spinlock_t lock; 6 spinlock_t lock;
7 7
8 /* MIDI fields */ 8 /* MIDI fields */
9 int my_mididev; 9 int my_mididev;
10 int pair_mididev; 10 int pair_mididev;
@@ -12,4 +12,3 @@ typedef struct vmidi_devc {
12 int intr_active; 12 int intr_active;
13 void (*midi_input_intr) (int dev, unsigned char data); 13 void (*midi_input_intr) (int dev, unsigned char data);
14 } vmidi_devc; 14 } vmidi_devc;
15