aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/v4l2-ctrls.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2011-07-10 16:34:48 -0300
committerMauro Carvalho Chehab2011-07-27 17:55:40 -0300
commitebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b (patch)
treef8d64559751c93413d5f6a5e1155b1bb8a3607cf /drivers/media/video/v4l2-ctrls.c
parent064f50966eb65e89c2434b57b2d2326dfee2b50c (diff)
[media] v4l2-ctrls: Fix a merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ctrls.c')
-rw-r--r--drivers/media/video/v4l2-ctrls.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index b3ed33053584..06b6014d4fb4 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -339,8 +339,6 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
NULL,
};
- switch (id) {
- case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
static const char * const flash_led_mode[] = {
"Off",
"Flash",