History

Backmerge tag 'v4.13-rc2' into drm-next

Linux 4.13-rc2 This is required for drm-misc fixing.

Dave Airlie committed 9 years ago

Commit 0eb2c0a2 parents 542aefb 520eccd450 files · +11820 −4475Browse files

Showing the changes to include/uapi (2 of 450 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/ioctls.h +1 −1
  2. include/uapi/linux/usb/audio.h +3 −3
include/uapi/asm-generic/ioctls.h+1−1
@@ -77,7 +77,7 @@ · 76 unmodified lines
7777 #define TIOCGPKT _IOR('T', 0x38, int) /* Get packet mode state */
7878 #define TIOCGPTLCK _IOR('T', 0x39, int) /* Get Pty lock state */
7979 #define TIOCGEXCL _IOR('T', 0x40, int) /* Get exclusive mode state */
80−#define TIOCGPTPEER _IOR('T', 0x41, int) /* Safely open the slave */
80+#define TIOCGPTPEER _IO('T', 0x41) /* Safely open the slave */
8181
8282 #define FIONCLEX 0x5450
8383 #define FIOCLEX 0x5451
include/uapi/linux/usb/audio.h+3−3
@@ -333,7 +333,7 @@ struct uac_processing_unit_descriptor { · 332 unmodified lines
333333 __u8 bDescriptorType;
334334 __u8 bDescriptorSubtype;
335335 __u8 bUnitID;
336− __u16 wProcessType;
336+ __le16 wProcessType;
337337 __u8 bNrInPins;
338338 __u8 baSourceID[];
339339 } __attribute__ ((packed));
@@ -491,8 +491,8 @@ struct uac_format_type_ii_ext_descriptor { · 151 unmodified lines
491491 __u8 bDescriptorType;
492492 __u8 bDescriptorSubtype;
493493 __u8 bFormatType;
494− __u16 wMaxBitRate;
495− __u16 wSamplesPerFrame;
494+ __le16 wMaxBitRate;
495+ __le16 wSamplesPerFrame;
496496 __u8 bHeaderLength;
497497 __u8 bSideBandProtocol;
498498 } __attribute__((packed));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t