aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/v_midi.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-16 07:50:49 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-16 07:50:49 +0100
commita9104f989916aac5d92bfa2c51915d5985fb2e6c (patch)
tree17bef4eac561e3ac90d98d68190978e686712b67 /sound/oss/v_midi.h
parentMerge remote branch 'alsa/fixes' into fix/misc (diff)
parentsound: fix opti92x-ad1848 build (diff)
downloadlinux-dev-a9104f989916aac5d92bfa2c51915d5985fb2e6c.tar.xz
linux-dev-a9104f989916aac5d92bfa2c51915d5985fb2e6c.zip
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 {
int dev;
/* State variables */
- int opened;
+ int opened;
spinlock_t lock;
-
+
/* MIDI fields */
int my_mididev;
int pair_mididev;
@@ -12,4 +12,3 @@ typedef struct vmidi_devc {
int intr_active;
void (*midi_input_intr) (int dev, unsigned char data);
} vmidi_devc;
-