Date: Fri, 31 Oct 2008 23:10:26 -0000 From: "Graham Bentley" <admin@cpcnw.co.uk> To: freebsd-questions@freebsd.org Subject: Re: Marvell 88E8052 PCI-E LAN on FreeBSD 7.0 Message-ID: <op.ujwvzoyft4j7n6@3bsd.cpcnw.co.uk> In-Reply-To: <20081031224841.13C581065706@hub.freebsd.org> References: <20081031224841.13C581065706@hub.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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 <sys/cdefs.h>
- __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 <sys/param.h>
#include <sys/systm.h>
--- 99,105 ----
*/
#include <sys/cdefs.h>
+ __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 <sys/param.h>
#include <sys/systm.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.ujwvzoyft4j7n6>