diff options
| author | Hans Verkuil | 2013-03-29 14:14:32 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-03-29 15:48:02 +0100 |
| commit | 2cb5972da8ee95c58db3375c288563f3b75bc61c (patch) | |
| tree | 8fce802ff231295c1db563acddb649075c4e1a85 /include/uapi/linux/v4l2-controls.h | |
| parent | [media] media: move dvb-usb-v2/cypress_firmware.c to media/common (diff) | |
| download | kernel-qcow2-linux-2cb5972da8ee95c58db3375c288563f3b75bc61c.tar.gz kernel-qcow2-linux-2cb5972da8ee95c58db3375c288563f3b75bc61c.tar.xz kernel-qcow2-linux-2cb5972da8ee95c58db3375c288563f3b75bc61c.zip | |
[media] v4l2-controls.h: update private control ranges to prevent overlap
These ranges shouldn't overlap.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/uapi/linux/v4l2-controls.h')
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 910d7cd3d9f4..7da22cec30cd 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -153,12 +153,12 @@ enum v4l2_colorfx { /* The base for the s2255 driver controls. - * We reserve 8 controls for this driver. */ -#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010) + * We reserve 16 controls for this driver. */ +#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) /* The base for the si476x driver controls. See include/media/si476x.h for the list - * of controls. Total of 16 controls is reserved for that driver */ -#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1010) + * of controls. Total of 16 controls is reserved for this driver */ +#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) /* MPEG-class control IDs */ |