Marvell 88E8052 PCI-E LAN on FreeBSD 7.0

Graham Bentley admin at cpcnw.co.uk
Fri Oct 31 16:10:31 PDT 2008


> 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>


More information about the freebsd-questions mailing list