diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 10:34:46 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 10:34:46 -0300 |
| commit | 4048e2b84b9dc128f03e8021d9ffd9e29b7c8912 (patch) | |
| tree | 9c5deaa01234f27d9503340569178b51461bfdaa /include/media | |
| parent | 8f632ad3bb753d67e9f9cc0dee23b1aa3e59772a (diff) | |
| parent | 793d8378b74ac283a4dd7cef1b304553c8a42260 (diff) | |
Merge tag 'v5.15.77' into 5.15-2.2.x-imx
This is the 5.15.77 stable release
Conflicts:
drivers/tty/serial/fsl_lpuart.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 3eb202259e8c..5e25a098e8ce 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -175,7 +175,8 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, * * @sd: pointer to &struct v4l2_subdev * @client: pointer to struct i2c_client - * @devname: the name of the device; if NULL, the I²C device's name will be used + * @devname: the name of the device; if NULL, the I²C device drivers's name + * will be used * @postfix: sub-device specific string to put right after the I²C device name; * may be NULL */ |