From 8ce5bef79e3e2c400264d1a786c9f829bc4483f5 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 10 Jul 2011 16:34:48 -0300
Subject: [PATCH] --- yaml --- r: 261471 b: refs/heads/master c:
 ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b h: refs/heads/master i:   261469:
 b2d7df1d234c39d0f62b774b2627ee10d65672e4   261467:
 e60c922756894736b1d09080b2896de5f73f23f5   261463:
 595f502ddde649e6ba986a43c4d618a4aa4ca6ef   261455:
 162d1e435d5f97be38d386cdc861bd5b2ee4e62a   261439:
 70cec654dd048feeb5e4482bf39e3cb36c6179b1 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/v4l2-ctrls.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 32454560a327..9bd098b8ac01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 064f50966eb65e89c2434b57b2d2326dfee2b50c
+refs/heads/master: ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index b3ed33053584..06b6014d4fb4 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/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",