[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 b3ed330535849024c5c681e6e50398300f668259..06b6014d4fb4cda5adb94c54a425c0b08b94019e 100644 (file)
--- 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",