diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:46 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:46 -0400 |
| commit | c944a93df0d566a66409628c4524f4fc4f62eaf5 (patch) | |
| tree | 64bd4f7f750344f5031172721f43778a0e95b768 /include/sound | |
| parent | 65b3864b85485a91f70988e1a222e3935bce87e4 (diff) | |
| parent | 9a1b64caac82aa02cb74587ffc798e6f42c6170a (diff) | |
Merge branch 'topic/rawmidi-fix' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/rawmidi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index b550a416d075..c23c26585700 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #define SNDRV_RAWMIDI_LFLG_INPUT (1<<1) | 42 | #define SNDRV_RAWMIDI_LFLG_INPUT (1<<1) |
| 43 | #define SNDRV_RAWMIDI_LFLG_OPEN (3<<0) | 43 | #define SNDRV_RAWMIDI_LFLG_OPEN (3<<0) |
| 44 | #define SNDRV_RAWMIDI_LFLG_APPEND (1<<2) | 44 | #define SNDRV_RAWMIDI_LFLG_APPEND (1<<2) |
| 45 | #define SNDRV_RAWMIDI_LFLG_NOOPENLOCK (1<<3) | ||
| 46 | 45 | ||
| 47 | struct snd_rawmidi; | 46 | struct snd_rawmidi; |
| 48 | struct snd_rawmidi_substream; | 47 | struct snd_rawmidi_substream; |