mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'for-linus' into for-next
Back-merge to prepare for applying more FireWire updates.
This commit is contained in:
commit
1900d947b5
2 changed files with 4 additions and 7 deletions
|
|
@ -45,7 +45,7 @@ struct snd_fw_async_midi_port {
|
|||
|
||||
struct snd_rawmidi_substream *substream;
|
||||
snd_fw_async_midi_port_fill fill;
|
||||
unsigned int consume_bytes;
|
||||
int consume_bytes;
|
||||
};
|
||||
|
||||
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,
|
||||
|
|
|
|||
Loading…
Reference in a new issue