From patchwork Tue Feb 2 20:03:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 76501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o12K3fcL015481 for ; Tue, 2 Feb 2010 20:03:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756495Ab0BBUD3 (ORCPT ); Tue, 2 Feb 2010 15:03:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26849 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756060Ab0BBUD3 (ORCPT ); Tue, 2 Feb 2010 15:03:29 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o12K3O5M031721 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 Feb 2010 15:03:24 -0500 Received: from [10.11.8.248] (vpn-8-248.rdu.redhat.com [10.11.8.248]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o12K3KvY013058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 2 Feb 2010 15:03:22 -0500 Message-ID: <4B688507.606@redhat.com> Date: Tue, 02 Feb 2010 18:03:19 -0200 From: Mauro Carvalho Chehab User-Agent: Thunderbird 2.0.0.22 (X11/20090609) MIME-Version: 1.0 To: Stefan Ringel CC: linux-media@vger.kernel.org, Devin Heitmueller Subject: Re: [PATCH] - tm6000 DVB support References: <4B673790.3030706@arcor.de> <4B673B2D.6040507@arcor.de> <4B675B19.3080705@redhat.com> <4B685FB9.1010805@arcor.de> In-Reply-To: <4B685FB9.1010805@arcor.de> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 02 Feb 2010 20:03:41 +0000 (UTC) --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -32,7 +32,7 @@ #include "tm6000.h" #include "tm6000-regs.h" #include "tuner-xc2028.h" -#include "tuner-xc5000.h" +#include "xc5000.h" #define TM6000_BOARD_UNKNOWN 0 #define TM5600_BOARD_GENERIC 1 and apply to your new tree, you'll have just one change there. A hunk starts with @@. the numbers after "-" are the line number and the number of lines of the original code. The numbers after "+" are the line number/line count after the patch. For example, on this hunk: @@ -402,6 +448,7 @@ static int tm6000_init_dev(struct tm6000_core *dev) } #endif } + return 0; err2: v4l2_device_unregister(&dev->v4l2_dev); It is changing the content of line number 402 of the source code. The original code has 6 lines (the 3 lines before and the 3 lines after the insertion). It is adding one line (the line with "+"). The resulting code will be at line #448 and will have 7 lines. If you copy the above, plus the name of the file to patch (the lines with --- and +++): --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -402,6 +448,7 @@ static int tm6000_init_dev(struct tm6000_core *dev) } #endif } + return 0; err2: v4l2_device_unregister(&dev->v4l2_dev);