diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:16:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:16:57 -0300 |
| commit | 617a8054280a567b073ab9091ee7255ea803e8c7 (patch) | |
| tree | 5558fcef57cd5739e3741d981fab7764f728cdf8 /linux/drivers/media/video | |
| parent | b5ab4b1d0d5368b783725875a0bf6281074d2ef9 (diff) | |
| download | mediapointer-dvb-s2-617a8054280a567b073ab9091ee7255ea803e8c7.tar.gz mediapointer-dvb-s2-617a8054280a567b073ab9091ee7255ea803e8c7.tar.bz2 | |
v4l2-common: Fix a merge conflict bad solved
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index bc5b40012..a5ce43102 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -589,9 +589,6 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste } EXPORT_SYMBOL(v4l2_ctrl_query_fill); - case V4L2_CID_CAMERA_CLASS: - case V4L2_CID_COLORFX: - return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0); /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and the menu. The qctrl pointer may be NULL, in which case it is ignored. If menu_items is NULL, then the menu items are retrieved using |