From 24568cd3608dba3d8fba116e3d28beddac74feb2 Mon Sep 17 00:00:00 2001 From: Frej Drejhammar Date: Sun, 23 Mar 2008 22:43:23 -0300 Subject: [PATCH] --- yaml --- r: 92566 b: refs/heads/master c: a8ac688938b89ab0fa8ffe16da0facdc73a70588 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/videodev2.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82c9be3f7686..92e8cb71f468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87a1738919ef028d16c462437e1480fc67338cd3 +refs/heads/master: a8ac688938b89ab0fa8ffe16da0facdc73a70588 diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h index 0659661ab6cd..c1411189ba6c 100644 --- a/trunk/include/linux/videodev2.h +++ b/trunk/include/linux/videodev2.h @@ -880,8 +880,9 @@ enum v4l2_power_line_frequency { #define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) #define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) #define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) +#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) /* last CID + 1 */ -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+30) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+31) /* MPEG-class control IDs defined by V4L2 */ #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)