aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/v_midi.h
diff options
context:
space:
mode:
authorGravatar Takashi Iwai <tiwai@suse.de> 2017-11-13 15:43:04 +0100
committerGravatar Takashi Iwai <tiwai@suse.de> 2017-11-13 15:43:13 +0100
commitc429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch)
tree80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/oss/v_midi.h
parentALSA: hda - fix headset mic problem for Dell machines with alc274 (diff)
parentALSA: ice1712: define i2c eeprom addr to header file (diff)
downloadlinux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz
linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.bz2
linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/v_midi.h')
-rw-r--r--sound/oss/v_midi.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/oss/v_midi.h b/sound/oss/v_midi.h
deleted file mode 100644
index 08e2185ee816..000000000000
--- a/sound/oss/v_midi.h
+++ /dev/null
@@ -1,14 +0,0 @@
-typedef struct vmidi_devc {
- int dev;
-
- /* State variables */
- int opened;
- spinlock_t lock;
-
- /* MIDI fields */
- int my_mididev;
- int pair_mididev;
- int input_opened;
- int intr_active;
- void (*midi_input_intr) (int dev, unsigned char data);
- } vmidi_devc;