diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/line6/midi.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/midi.h')
-rw-r--r-- | drivers/staging/line6/midi.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h index c69fd11..b73a025 100644 --- a/drivers/staging/line6/midi.h +++ b/drivers/staging/line6/midi.h @@ -1,7 +1,7 @@ /* - * Line6 Linux USB driver - 0.8.0 + * Line6 Linux USB driver - 0.9.1beta * - * Copyright (C) 2004-2009 Markus Grabner (grabner@icg.tugraz.at) + * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -12,15 +12,12 @@ #ifndef MIDI_H #define MIDI_H - #include <sound/rawmidi.h> #include "midibuf.h" - #define MIDI_BUFFER_SIZE 1024 - struct snd_line6_midi { /** Pointer back to the Line6 driver data structure. @@ -78,10 +75,8 @@ struct snd_line6_midi { struct MidiBuffer midibuf_out; }; - extern int line6_init_midi(struct usb_line6 *line6); extern void line6_midi_receive(struct usb_line6 *line6, unsigned char *data, int length); - #endif |