diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 03:35:50 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 03:35:50 -0500 |
| commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
| tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /include/sound | |
| parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/asound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 1f57bb92eb5a..098595500632 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
| @@ -544,7 +544,7 @@ struct snd_rawmidi_status { | |||
| 544 | * Timer section - /dev/snd/timer | 544 | * Timer section - /dev/snd/timer |
| 545 | */ | 545 | */ |
| 546 | 546 | ||
| 547 | #define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) | 547 | #define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) |
| 548 | 548 | ||
| 549 | enum { | 549 | enum { |
| 550 | SNDRV_TIMER_CLASS_NONE = -1, | 550 | SNDRV_TIMER_CLASS_NONE = -1, |