From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 10 Jul 2011 19:34:48 +0000 (-0300)
Subject: [media] v4l2-ctrls: Fix a merge conflict
X-Git-Tag: v3.1-rc1~116^2~138
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b;p=linux.git

[media] v4l2-ctrls: Fix a merge conflict

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

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