diff options
| author | Ingo Molnar <[email protected]> | 2017-08-17 10:50:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-08-17 10:50:48 +0200 |
| commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
| tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /include/uapi/linux | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/usb/audio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h index d2314be4f0c0..a4680a5bf5dd 100644 --- a/include/uapi/linux/usb/audio.h +++ b/include/uapi/linux/usb/audio.h @@ -333,7 +333,7 @@ struct uac_processing_unit_descriptor { __u8 bDescriptorType; __u8 bDescriptorSubtype; __u8 bUnitID; - __u16 wProcessType; + __le16 wProcessType; __u8 bNrInPins; __u8 baSourceID[]; } __attribute__ ((packed)); @@ -491,8 +491,8 @@ struct uac_format_type_ii_ext_descriptor { __u8 bDescriptorType; __u8 bDescriptorSubtype; __u8 bFormatType; - __u16 wMaxBitRate; - __u16 wSamplesPerFrame; + __le16 wMaxBitRate; + __le16 wSamplesPerFrame; __u8 bHeaderLength; __u8 bSideBandProtocol; } __attribute__((packed)); |