[media] v4l2-ctrls: Fix a merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

[media] v4l2-ctrls: Fix a merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
ebee4b58 · Mauro Carvalho Chehab · 064f5096 · ebee4b58
Commit ebee4b58 authored Jul 10, 2011 by Mauro Carvalho Chehab
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/media/video/v4l2-ctrls.c drivers/media/video/v4l2-ctrls.c +0 -2

No files found.
--- 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",