The patch number 10736 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
v4l2-common: Fix a merge conflict bad solved
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/v4l2-common.c | 3 ---
1 file changed, 3 deletions(-)
diff -r 2b6f18a40bb6 -r d25029dea583 linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c Thu Feb 26 21:16:31 2009 -0300
+++ b/linux/drivers/media/video/v4l2-common.c Thu Feb 26 21:16:57 2009 -0300
@@ -589,9 +589,6 @@ int v4l2_ctrl_query_fill(struct v4l2_que
}
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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d25029dea583c2d9734d64ab9e2fa90f487ae76d
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
