We need the IIO fixes in here as well.
Showing the changes to include/uapi/linux (2 of 569 files). Show all
Unified · Split
| @@ -79,6 +79,7 @@ enum { · 78 unmodified lines | ||
| 79 | 79 | ETHTOOL_MSG_TSINFO_GET_REPLY, |
| 80 | 80 | ETHTOOL_MSG_CABLE_TEST_NTF, |
| 81 | 81 | ETHTOOL_MSG_CABLE_TEST_TDR_NTF, |
| 82 | + ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY, | |
| 82 | 83 | |
| 83 | 84 | /* add new constants above here */ |
| 84 | 85 | __ETHTOOL_MSG_KERNEL_CNT, |
| @@ -191,8 +191,6 @@ enum v4l2_memory { · 190 unmodified lines | ||
| 191 | 191 | V4L2_MEMORY_DMABUF = 4, |
| 192 | 192 | }; |
| 193 | 193 | |
| 194 | −#define V4L2_FLAG_MEMORY_NON_CONSISTENT (1 << 0) | |
| 195 | − | |
| 196 | 194 | /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ |
| 197 | 195 | enum v4l2_colorspace { |
| 198 | 196 | /* |
| @@ -949,10 +947,7 @@ struct v4l2_requestbuffers { · 750 unmodified lines | ||
| 949 | 947 | __u32 type; /* enum v4l2_buf_type */ |
| 950 | 948 | __u32 memory; /* enum v4l2_memory */ |
| 951 | 949 | __u32 capabilities; |
| 952 | − union { | |
| 953 | − __u32 flags; | |
| 954 | − __u32 reserved[1]; | |
| 955 | − }; | |
| 950 | + __u32 reserved[1]; | |
| 956 | 951 | }; |
| 957 | 952 | |
| 958 | 953 | /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */ |
| @@ -2456,9 +2451,6 @@ struct v4l2_dbg_chip_info { · 1497 unmodified lines | ||
| 2456 | 2451 | * @memory: enum v4l2_memory; buffer memory type |
| 2457 | 2452 | * @format: frame format, for which buffers are requested |
| 2458 | 2453 | * @capabilities: capabilities of this buffer type. |
| 2459 | − * @flags: additional buffer management attributes (ignored unless the | |
| 2460 | − * queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability | |
| 2461 | − * and configured for MMAP streaming I/O). | |
| 2462 | 2454 | * @reserved: future extensions |
| 2463 | 2455 | */ |
| 2464 | 2456 | struct v4l2_create_buffers { |
| @@ -2467,8 +2459,7 @@ struct v4l2_create_buffers { · 2 unmodified lines | ||
| 2467 | 2459 | __u32 memory; |
| 2468 | 2460 | struct v4l2_format format; |
| 2469 | 2461 | __u32 capabilities; |
| 2470 | − __u32 flags; | |
| 2471 | − __u32 reserved[6]; | |
| 2462 | + __u32 reserved[7]; | |
| 2472 | 2463 | }; |
| 2473 | 2464 | |
| 2474 | 2465 | /* |