diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-05 08:23:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-05 08:23:32 +0100 |
| commit | 36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 (patch) | |
| tree | 1dd1a6cd08f50c284588400c9e426aa8eba07c5e /include/linux | |
| parent | 767d75ad1c08c31646498a13837a5c59db90ccad (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
Merge branch 'topic/misc' into topic/usb
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; |