diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
index 7e0c68747134d2fc7cf919ca820670477927bdbe..8408caaee276ba6869a5c55a033fbc8ab672cdeb 100644
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
@@ -283,8 +283,15 @@ minimum value disables backlight compensation.
Selects a color effect. Possible values for
enum v4l2_colorfx are:
V4L2_COLORFX_NONE (0),
-V4L2_COLORFX_BW (1) and
-V4L2_COLORFX_SEPIA (2).
+V4L2_COLORFX_BW (1),
+V4L2_COLORFX_SEPIA (2),
+V4L2_COLORFX_NEGATIVE (3),
+V4L2_COLORFX_EMBOSS (4),
+V4L2_COLORFX_SKETCH (5),
+V4L2_COLORFX_SKY_BLUE (6),
+V4L2_COLORFX_GRASS_GREEN (7),
+V4L2_COLORFX_SKIN_WHITEN (8) and
+V4L2_COLORFX_VIVID (9).
V4L2_CID_ROTATE
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml
index c18dfebedeff75191ab519ab3260b77e65a75c8e..865b06d9e679e9b216d52e223b0c019273686194 100644
--- a/Documentation/DocBook/v4l/videodev2.h.xml
+++ b/Documentation/DocBook/v4l/videodev2.h.xml
@@ -1018,6 +1018,13 @@ enum v4l2_colorfx {
V4L2_COLORFX_NONE = 0,
V4L2_COLORFX_BW = 1,
V4L2_COLORFX_SEPIA = 2,
+ V4L2_COLORFX_NEGATIVE = 3,
+ V4L2_COLORFX_EMBOSS = 4,
+ V4L2_COLORFX_SKETCH = 5,
+ V4L2_COLORFX_SKY_BLUE = 6,
+ V4L2_COLORFX_GRASS_GREEN = 7,
+ V4L2_COLORFX_SKIN_WHITEN = 8,
+ V4L2_COLORFX_VIVID = 9.
};
#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 67944f53a79a428fec1e2bed9f914a082127d3b9..035c414507a138d6bbbc8181aef07b1f5e696ca1 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -343,6 +343,13 @@ const char **v4l2_ctrl_get_menu(u32 id)
"None",
"Black & White",
"Sepia",
+ "Negative",
+ "Emboss",
+ "Sketch",
+ "Sky blue",
+ "Grass green",
+ "Skin whiten",
+ "Vivid",
NULL
};
static const char *tune_preemphasis[] = {
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 65d13ec13c1f7ed3c68913f140d2ca7ec17b52d8..e878056952c727f26393cd5ffa6154e1ada8e6bf 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1026,6 +1026,13 @@ enum v4l2_colorfx {
V4L2_COLORFX_NONE = 0,
V4L2_COLORFX_BW = 1,
V4L2_COLORFX_SEPIA = 2,
+ V4L2_COLORFX_NEGATIVE = 3,
+ V4L2_COLORFX_EMBOSS = 4,
+ V4L2_COLORFX_SKETCH = 5,
+ V4L2_COLORFX_SKY_BLUE = 6,
+ V4L2_COLORFX_GRASS_GREEN = 7,
+ V4L2_COLORFX_SKIN_WHITEN = 8,
+ V4L2_COLORFX_VIVID = 9,
};
#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)