Merge branch 'topic/rawmidi-fix' into for-linus

c944a93d · Takashi Iwai · 65b3864b · 9a1b64ca · c944a93d · c944a93d
Commit c944a93d authored Mar 24, 2009 by Takashi Iwai
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 195 additions and 185 deletions

include/sound/rawmidi.h include/sound/rawmidi.h +0 -1

sound/core/rawmidi.c sound/core/rawmidi.c +195 -184

No files found.
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -42,7 +42,6 @@
 #define SNDRV_RAWMIDI_LFLG_INPUT	(1<<1)
 #define SNDRV_RAWMIDI_LFLG_OPEN		(3<<0)
 #define SNDRV_RAWMIDI_LFLG_APPEND	(1<<2)
-#define	SNDRV_RAWMIDI_LFLG_NOOPENLOCK	(1<<3)
 struct snd_rawmidi;
 struct snd_rawmidi_substream;

--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c