diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-12-12 00:14:47 +0200 | 
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-12-15 22:10:24 +0200 | 
| commit | 4b9b925239d005d96cbbc262f2e637b2d60ce143 (patch) | |
| tree | 30374edaf37637b8a57ef06c7ad24d74e5620571 /include/linux/v4l2-controls.h | |
| parent | 8f6921584eed1b12b9b05f4bb8535a2cf194402d (diff) | |
Update headers from upstream kernel
Upstream commit 71947828caef0c83d4245f7d1eaddc799b4ff1d1
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include/linux/v4l2-controls.h')
| -rw-r--r-- | include/linux/v4l2-controls.h | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index e946e43..661f119 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -746,6 +746,8 @@ enum v4l2_auto_focus_range {  	V4L2_AUTO_FOCUS_RANGE_INFINITY		= 3,  }; +#define V4L2_CID_PAN_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+32) +#define V4L2_CID_TILT_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+33)  /* FM Modulator class control IDs */ @@ -865,6 +867,10 @@ enum v4l2_jpeg_chroma_subsampling {  #define V4L2_CID_VBLANK				(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)  #define V4L2_CID_HBLANK				(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)  #define V4L2_CID_ANALOGUE_GAIN			(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3) +#define V4L2_CID_TEST_PATTERN_RED		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 4) +#define V4L2_CID_TEST_PATTERN_GREENR		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5) +#define V4L2_CID_TEST_PATTERN_BLUE		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6) +#define V4L2_CID_TEST_PATTERN_GREENB		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)  /* Image processing controls */ | 
