diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
| commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
| tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /include | |
| parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
| download | linux-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/audio.h | 2 | ||||
| -rw-r--r-- | include/sound/asound.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index 6bb293684eb8..4d3e450e2b03 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h @@ -269,8 +269,8 @@ struct uac_format_type_i_ext_descriptor { __u8 bLength; __u8 bDescriptorType; __u8 bDescriptorSubtype; - __u8 bSubslotSize; __u8 bFormatType; + __u8 bSubslotSize; __u8 bBitResolution; __u8 bHeaderLength; __u8 bControlSize; 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 { * Timer section - /dev/snd/timer */ -#define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) +#define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) enum { SNDRV_TIMER_CLASS_NONE = -1, |