diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2013-03-29 09:14:32 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-29 10:48:02 -0400 |
| commit | 2cb5972da8ee95c58db3375c288563f3b75bc61c (patch) | |
| tree | 8fce802ff231295c1db563acddb649075c4e1a85 /include/uapi/linux | |
| parent | 79a63c60a6a2ae589e44529401e0ab1150e9408a (diff) | |
[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')
| -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 { | |||
| 153 | 153 | ||
| 154 | 154 | ||
| 155 | /* The base for the s2255 driver controls. | 155 | /* The base for the s2255 driver controls. |
| 156 | * We reserve 8 controls for this driver. */ | 156 | * We reserve 16 controls for this driver. */ |
| 157 | #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010) | 157 | #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) |
| 158 | 158 | ||
| 159 | /* The base for the si476x driver controls. See include/media/si476x.h for the list | 159 | /* The base for the si476x driver controls. See include/media/si476x.h for the list |
| 160 | * of controls. Total of 16 controls is reserved for that driver */ | 160 | * of controls. Total of 16 controls is reserved for this driver */ |
| 161 | #define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1010) | 161 | #define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) |
| 162 | 162 | ||
| 163 | /* MPEG-class control IDs */ | 163 | /* MPEG-class control IDs */ |
| 164 | 164 | ||