From e5197bf4e1bb61f31c062670d1b7bc4ffe04482e Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Sun, 14 Mar 2010 14:28:54 -0300 Subject: [PATCH] --- yaml --- r: 192819 b: refs/heads/master c: a3415c15e1b5965c8efe0c0eb84b49689ed954ef h: refs/heads/master i: 192817: acece6d5e0e859a148b5e1bb46c29c1b63e74086 192815: 2a9cba23bdfd39ba5028f416941f2050b0b03ae0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-common.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eb95c4c432ae..e4fda866b272 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8889a8a53e0144da5dee58e9693190bbdf1c3959 +refs/heads/master: a3415c15e1b5965c8efe0c0eb84b49689ed954ef diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c index 36b5cb86fb57..e67983461008 100644 --- a/trunk/drivers/media/video/v4l2-common.c +++ b/trunk/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";