From owner-freebsd-questions@FreeBSD.ORG Fri Oct 31 23:10:31 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAA331065674 for ; Fri, 31 Oct 2008 23:10:31 +0000 (UTC) (envelope-from admin@cpcnw.co.uk) Received: from pih-relay05.plus.net (pih-relay05.plus.net [212.159.14.18]) by mx1.freebsd.org (Postfix) with ESMTP id 721A68FC0C for ; Fri, 31 Oct 2008 23:10:31 +0000 (UTC) (envelope-from admin@cpcnw.co.uk) Received: from [81.174.174.115] (helo=3bsd.cpcnw.co.uk) by pih-relay05.plus.net with esmtp (Exim) id 1Kw38P-0000aE-Bh for freebsd-questions@freebsd.org; Fri, 31 Oct 2008 23:10:29 +0000 Date: Fri, 31 Oct 2008 23:10:26 -0000 To: freebsd-questions@freebsd.org From: "Graham Bentley" Organization: Custom PC North West Content-Type: text/plain; format=flowed; delsp=yes; charset=us-ascii MIME-Version: 1.0 References: <20081031224841.13C581065706@hub.freebsd.org> Content-Transfer-Encoding: 7bit Message-ID: In-Reply-To: <20081031224841.13C581065706@hub.freebsd.org> User-Agent: Opera Mail/9.60 (FreeBSD) X-Plusnet-Relay: 9c693f62701980ee9722f9c72500c28e Subject: Re: Marvell 88E8052 PCI-E LAN on FreeBSD 7.0 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: admin@cpcnw.co.uk List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2008 23:10:31 -0000 > select "unified" diff on the above and save it to a file, then > cd /usr > patch < patchfilewhere "patchfile" is the saved file, then build as > normal. 3bsd# patch < if_msk.c.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- src/sys/dev/msk/if_msk.c 2008/09/25 07:31:45 1.32 |+++ src/sys/dev/msk/if_msk.c 2008/09/30 04:47:49 1.33 -------------------------- Patching file src/sys/dev/msk/if_msk.c using Plan A... Hunk #1 failed at 99. Hunk #2 succeeded at 2708 (offset 107 lines). 1 out of 2 hunks failed--saving rejects to src/sys/dev/msk/if_msk.c.rej done Don't like the look of first result? src/sys/dev/msk/if_msk.c.rej -> *************** *** 99,105 **** */ #include - __FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/msk/if_msk.c,v 1.32 2008/09/25 07:31:45 yongari Exp $"); #include #include --- 99,105 ---- */ #include + __FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/msk/if_msk.c,v 1.33 2008/09/30 04:47:49 yongari Exp $"); #include #include