From patchwork Thu Mar 7 16:19:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 17154 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UDdYD-0006do-18; Thu, 07 Mar 2013 17:20:13 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1UDdYC-0002E3-Cz; Thu, 07 Mar 2013 17:20:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755076Ab3CGQUI (ORCPT + 1 other); Thu, 7 Mar 2013 11:20:08 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:47559 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095Ab3CGQUI (ORCPT ); Thu, 7 Mar 2013 11:20:08 -0500 Received: by mail-wg0-f51.google.com with SMTP id 8so1188462wgl.30 for ; Thu, 07 Mar 2013 08:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=3jjkPzPbD9uR6BGqEJPgrpeA8JFw5dNRmh3CTHjXmJE=; b=XwJr78RfxUU9Td9GJFW/Zcb04PBFNjplbx092cRthbfukplkr/302U8nyiIHGkLeRx 9Np1Q3++BjfRIRXOTRSqSPN1JBirc5WekZApdjwGeD/lqU5CmvOynHWeh+lol7c+XDIe hRsPAGe71ELmCLMiUBj/WeXe75b8cw6nUVi3x6PGcMDfmV3A+uUJHSHKWp9wAIraMUmz h9UTj4mgXpUa7LS5ugsV/2nsOfzqWexdNqm8p8E059UjNC+iD54MIJPY+am3Hc8Mni7O ccQOgIL+G1DG4Y+/Vq6MsB31IkWQEZncOEXOjFo3ZJX9r/sPIJTu0rdq/f+3JnNz/5G3 yLgw== X-Received: by 10.180.183.81 with SMTP id ek17mr26335587wic.2.1362673206346; Thu, 07 Mar 2013 08:20:06 -0800 (PST) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id k5sm3782162wiy.5.2013.03.07.08.20.04 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 07 Mar 2013 08:20:05 -0800 (PST) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com, hans.verkuil@cisco.com Cc: Gianluca Gennari Subject: [PATCH] cx231xx: fix undefined function cx231xx_g_chip_ident() Date: Thu, 7 Mar 2013 17:19:29 +0100 Message-Id: <1362673169-23668-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.8.1.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.7.161217 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This patch: http://git.linuxtv.org/media_tree.git/commit/b86d15440b683f8634c0cb26fc0861a5bc4913ac is missing a chunk when compared to an older version: https://patchwork.kernel.org/patch/2063281/ probably because of an unresolved merging conflict. This causes the following error: WARNING: "cx231xx_g_chip_ident" [/home/jena/media_build/v4l/cx231xx.ko] undefined! Signed-off-by: Gianluca Gennari --- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 41c5c99..ac62008 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -1227,7 +1227,7 @@ int cx231xx_s_frequency(struct file *file, void *priv, return rc; } -int vidioc_g_chip_ident(struct file *file, void *fh, +int cx231xx_g_chip_ident(struct file *file, void *fh, struct v4l2_dbg_chip_ident *chip) { chip->ident = V4L2_IDENT_NONE;