Hi, On Tuesday 03 March 2009 13:50:30 Brandon Jenkins wrote: > > I was upgrading drivers this morning to capture the latest changes > for the cx18 and I received a merge conflict in v4l2-common.c. In my > system, 1 HDPVR and 3 CX18s. The HDPVR sources are 5 weeks old from > their last sync up but contain: > > case V4L2_CID_SHARPNESS: > > The newer sources do not, but still have reference to sharpness at > line 420: case V4L2_CID_SHARPNESS: return "Sharpness"; > > Because I don't know which way the code is going (is sharpness in or > out) I can't submit a patch, but thought I would raise here. Diff > below was pulled from clean clone of v4l-dvb tree. That's seems to be a merge issue on your side. V4L2_CID_SHARPNESS was afaik never handled in v4l2_ctrl_query_fill(). I pushed a correctly merge hdpvr driver. Janne -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
