From patchwork Tue Mar 3 12:50:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Jenkins X-Patchwork-Id: 9699 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n23CoYfG029558 for ; Tue, 3 Mar 2009 12:50:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751598AbZCCMue (ORCPT ); Tue, 3 Mar 2009 07:50:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751529AbZCCMue (ORCPT ); Tue, 3 Mar 2009 07:50:34 -0500 Received: from yx-out-2324.google.com ([74.125.44.29]:64042 "EHLO yx-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751367AbZCCMud (ORCPT ); Tue, 3 Mar 2009 07:50:33 -0500 Received: by yx-out-2324.google.com with SMTP id 8so1802484yxm.1 for ; Tue, 03 Mar 2009 04:50:30 -0800 (PST) MIME-Version: 1.0 Received: by 10.220.97.75 with SMTP id k11mr2156384vcn.39.1236084630448; Tue, 03 Mar 2009 04:50:30 -0800 (PST) Date: Tue, 3 Mar 2009 07:50:30 -0500 Message-ID: Subject: Possible omission in v4l2-common.c? From: Brandon Jenkins To: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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: