Commit e7684f3b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/midi20' into for-next 



Pull a fixup for build error on big-endian archs.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 03a58514 dafb82e7

include/sound/ump_msg.h

+1 −1
Original line number Diff line number Diff line
@@ -192,13 +192,13 @@ struct snd_ump_midi1_msg_program { 
	u32 program:8;

	u32 reserved:8;

#else

#endif

	u32 reserved:8;

	u32 program:8;

	u32 channel:4;

	u32 status:4;

	u32 group:4;

	u32 type:4;

#endif

} __packed;



/* MIDI 1.0 Channel Pressure (32bit) */