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

git-mirror · Mar 23, 2009 · c944a93 · c944a93
2 parents 65b3864 + 9a1b64c
commit c944a93
Show file tree

Hide file tree

Showing 2 changed files with 195 additions and 185 deletions.
diff --git 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;