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

[media] v4l2-ctrls: Fix a merge conflict 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 064f5096

drivers/media/video/v4l2-ctrls.c

+0 −2
Original line number Diff line number Diff line
@@ -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",