hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] v4l2-ctrls: Fix a merge conflict 

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-07-10 16:34:48 -03:00
parent 064f50966e
commit ebee4b589f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/v4l2-ctrls.c
View File

@ -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",