diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-06 17:03:50 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-06 17:03:50 -0800 |
| commit | 0c92218f4e7d4b4a7245d32bea042fa6f9cc39d7 (patch) | |
| tree | 44d6ba1879278a5a1b58178e9b0f799427e52e0e /include/uapi/linux | |
| parent | b2f557a21bc8fffdcd65794eda8a854e024999f3 (diff) | |
| parent | 33cc938e65a98f1d29d0a18403dbbee050dcad9a (diff) | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/stddef.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/v4l2-subdev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h index 5c6c4269f7ef..2ec6f35cda32 100644 --- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h @@ -27,7 +27,7 @@ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ - } + } ATTRS #ifdef __cplusplus /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h index 4a195b68f28f..b383c2fe0cf3 100644 --- a/include/uapi/linux/v4l2-subdev.h +++ b/include/uapi/linux/v4l2-subdev.h @@ -239,7 +239,7 @@ struct v4l2_subdev_routing { * set (which is the default), the 'stream' fields will be forced to 0 by the * kernel. */ - #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1U << 0) + #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1ULL << 0) /** * struct v4l2_subdev_client_capability - Capabilities of the client accessing |