Hello all, 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. Thanks, Brandon diff -r 91f9c6c451f7 linux/drivers/media/video/v4l2-common.c --- a/linux/drivers/media/video/v4l2-common.c Mon Mar 02 09:39:13 2009 -0300 +++ b/linux/drivers/media/video/v4l2-common.c Tue Mar 03 07:44:58 2009 -0500 @@ -567,6 +567,7 @@ case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: case V4L2_CID_HUE: + case V4L2_CID_SHARPNESS: case V4L2_CID_RED_BALANCE: case V4L2_CID_BLUE_BALANCE: case V4L2_CID_GAMMA: -- 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
