summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Schaefer2010-03-14 18:28:54 +0100
committerMauro Carvalho Chehab2010-05-18 05:47:19 +0200
commita3415c15e1b5965c8efe0c0eb84b49689ed954ef (patch)
tree884ddfff5740aa32b7ed02e52b2d8216f0462c2a
parentV4L/DVB: Staging: cx25821: fix coding style issues in cx25821-alsa.c (diff)
downloadkernel-qcow2-linux-a3415c15e1b5965c8efe0c0eb84b49689ed954ef.tar.gz
kernel-qcow2-linux-a3415c15e1b5965c8efe0c0eb84b49689ed954ef.tar.xz
kernel-qcow2-linux-a3415c15e1b5965c8efe0c0eb84b49689ed954ef.zip
V4L/DVB: v4l2_ctrl_get_name(): add missing control names, and make title for V4L2_CID_BG_COLOR consistent
v4l2_ctrl_get_name(): add missing control names, and make title for V4L2_CID_BG_COLOR consistent V4L2_CID_AUTOBRIGHTNESS was introduced with kernel 2.6.31 V4L2_CID_BAND_STOP_FILTER was introduced with kernel 2.6.32 Signed-off-by: Frank Schaefer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 36b5cb86fb57..e67983461008 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -431,8 +431,10 @@ const char *v4l2_ctrl_get_name(u32 id)
case V4L2_CID_CHROMA_AGC: return "Chroma AGC";
case V4L2_CID_COLOR_KILLER: return "Color Killer";
case V4L2_CID_COLORFX: return "Color Effects";
+ case V4L2_CID_AUTOBRIGHTNESS: return "Brightness, Automatic";
+ case V4L2_CID_BAND_STOP_FILTER: return "Band-Stop Filter";
case V4L2_CID_ROTATE: return "Rotate";
- case V4L2_CID_BG_COLOR: return "Background color";
+ case V4L2_CID_BG_COLOR: return "Background Color";
/* MPEG controls */
case V4L2_CID_MPEG_CLASS: return "MPEG Encoder Controls";