diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /sound/oss/v_midi.h | |
parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/v_midi.h')
-rw-r--r-- | sound/oss/v_midi.h | 5 |
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; - |