We want the IIO and staging driver fixes in here as well.
Showing the changes to include/uapi/linux (3 of 388 files). Show all
Unified · Split
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ | 32 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ |
| 33 | #define ETH_TLEN 2 /* Octets in ethernet type field */ | ||
| 33 | #define ETH_HLEN 14 /* Total octets in header. */ | 34 | #define ETH_HLEN 14 /* Total octets in header. */ |
| 34 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ | 35 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ |
| 35 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ | 36 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ |
| @@ -54,7 +54,6 @@ · 53 unmodified lines | |||
| 54 | #define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW) | 54 | #define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW) |
| 55 | #define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE) | 55 | #define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE) |
| 56 | #define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2) | 56 | #define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2) |
| 57 | #define LIRC_CAN_SEND_SCANCODE LIRC_MODE2SEND(LIRC_MODE_SCANCODE) | ||
| 58 | #define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE) | 57 | #define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE) |
| 59 | 58 | ||
| 60 | #define LIRC_CAN_SEND_MASK 0x0000003f | 59 | #define LIRC_CAN_SEND_MASK 0x0000003f |
| @@ -370,7 +370,7 @@ static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_d · 369 unmodified lines | |||
| 370 | { | 370 | { |
| 371 | return (protocol == UAC_VERSION_1) ? | 371 | return (protocol == UAC_VERSION_1) ? |
| 372 | desc->baSourceID[desc->bNrInPins + 4] : | 372 | desc->baSourceID[desc->bNrInPins + 4] : |
| 373 | desc->baSourceID[desc->bNrInPins + 6]; | 373 | 2; /* in UAC2, this value is constant */ |
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, | 376 | static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, |
| @@ -378,7 +378,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de · 1 unmodified line | |||
| 378 | { | 378 | { |
| 379 | return (protocol == UAC_VERSION_1) ? | 379 | return (protocol == UAC_VERSION_1) ? |
| 380 | &desc->baSourceID[desc->bNrInPins + 5] : | 380 | &desc->baSourceID[desc->bNrInPins + 5] : |
| 381 | &desc->baSourceID[desc->bNrInPins + 7]; | 381 | &desc->baSourceID[desc->bNrInPins + 6]; |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, | 384 | static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, |