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/linux | |
parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/usb/audio.h | 2 |
1 files changed, 1 insertions, 1 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; |