diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2026-02-03 12:04:13 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2026-02-03 12:04:13 +0100 |
| commit | 3e4067169c573fba9dd8f77480f3a6e9c723b507 (patch) | |
| tree | bb332f90943149696e655f6745c5e4c934b8a9fb /Documentation/userspace-api | |
| parent | 5c4378b7b0e1f45cf38e77db9305ee2c7bf88002 (diff) | |
| parent | 18f7fcd5e69a04df57b563360b88be72471d6b62 (diff) | |
Merge branch 'v6.19-rc8'
Update to avoid conflicts with /urgent patches.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'Documentation/userspace-api')
| -rw-r--r-- | Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst b/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst index 696e0a645a7e..f8029bcb5282 100644 --- a/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst +++ b/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst @@ -44,7 +44,7 @@ member and userspace must populate the type member with a value from struct v4l2_isp_params_buffer *params = (struct v4l2_isp_params_buffer *)buffer; - params->version = MALI_C55_PARAM_BUFFER_V1; + params->version = V4L2_ISP_PARAMS_VERSION_V1; params->data_size = 0; void *data = (void *)params->data; |