diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-10 19:34:48 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 20:55:40 (GMT) |
| commit | ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b (patch) | |
| tree | f8d64559751c93413d5f6a5e1155b1bb8a3607cf /drivers/media/video/v4l2-ctrls.c | |
| parent | 064f50966eb65e89c2434b57b2d2326dfee2b50c (diff) | |
| download | linux-fsl-qoriq-ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b.tar.xz | |
[media] v4l2-ctrls: Fix a merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ctrls.c')
| -rw-r--r-- | drivers/media/video/v4l2-ctrls.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index b3ed330..06b6014 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", |