Skip to content

L
linux
Commit ebee4b58 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] v4l2-ctrls: Fix a merge conflict 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 064f5096
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
drivers/media/video/v4l2-ctrls.c
View file @ ebee4b58
...@@ -339,8 +339,6 @@ const char * const *v4l2_ctrl_get_menu(u32 id) ...@@ -339,8 +339,6 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
NULL, NULL,
}; };
switch (id) {
case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
static const char * const flash_led_mode[] = { static const char * const flash_led_mode[] = {
"Off", "Off",
"Flash", "Flash",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7