[Glibc-bsd-commits] r2287 - trunk/kfreebsd-6/debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-08-06 17:42:17 +0000 (Wed, 06 Aug 2008)
New Revision: 2287

Modified:
   trunk/kfreebsd-6/debian/patches/000_nfe.diff
   trunk/kfreebsd-6/debian/patches/920_gcc4.diff
Log:
* fix obvious /dev/null problem



Modified: trunk/kfreebsd-6/debian/patches/000_nfe.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_nfe.diff	2008-08-06 15:35:18 UTC (rev 2286)
+++ trunk/kfreebsd-6/debian/patches/000_nfe.diff	2008-08-06 17:42:17 UTC (rev 2287)
@@ -1,6 +1,6 @@
 Index: src/sys/dev/nfe/if_nfe.c
 ===================================================================
---- src//dev/null
+--- /dev/null
 +++ src/sys/dev/nfe/if_nfe.c
 @@ -0,0 +1,2231 @@
 +/*	$OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $	*/
@@ -2236,7 +2236,7 @@
 +}
 Index: src/sys/dev/nfe/if_nfereg.h
 ===================================================================
---- src//dev/null
+--- /dev/null
 +++ src/sys/dev/nfe/if_nfereg.h
 @@ -0,0 +1,248 @@
 +/*	$OpenBSD: if_nfereg.h,v 1.16 2006/02/22 19:23:44 damien Exp $	*/
@@ -2489,7 +2489,7 @@
 +#define NFE_DEBUG_ALL		0xFFFF
 Index: src/sys/dev/nfe/if_nfevar.h
 ===================================================================
---- src//dev/null
+--- /dev/null
 +++ src/sys/dev/nfe/if_nfevar.h
 @@ -0,0 +1,124 @@
 +/*	$OpenBSD: if_nfevar.h,v 1.11 2006/02/19 13:57:02 damien Exp $	*/
@@ -2618,7 +2618,7 @@
 +};
 Index: src/sys/modules/nfe/Makefile
 ===================================================================
---- src//dev/null
+--- /dev/null
 +++ src/sys/modules/nfe/Makefile
 @@ -0,0 +1,6 @@
 +.PATH: ${.CURDIR}/../../dev/nfe

Modified: trunk/kfreebsd-6/debian/patches/920_gcc4.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/920_gcc4.diff	2008-08-06 15:35:18 UTC (rev 2286)
+++ trunk/kfreebsd-6/debian/patches/920_gcc4.diff	2008-08-06 17:42:17 UTC (rev 2287)
@@ -205,8 +205,8 @@
  DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
  DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0);
  DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);
---- src/./sys/amd64/include/smp.h.orig	2008-02-01 10:37:18.000000000 +0100
-+++ src/./sys/amd64/include/smp.h	2008-02-01 10:37:27.000000000 +0100
+--- src/sys/amd64/include/smp.h.orig	2008-02-01 10:37:18.000000000 +0100
++++ src/sys/amd64/include/smp.h	2008-02-01 10:37:27.000000000 +0100
 @@ -23,6 +23,7 @@
  #include <machine/frame.h>
  #include <machine/intr_machdep.h>
@@ -226,7 +226,7 @@
  /*
   * CPU topology map datastructures for HTT.
   */
---- src//dev/null	2008-02-01 17:26:01.000000000 +0100
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ src/sys/libkern/memset.c	2008-02-01 17:26:42.000000000 +0100
 @@ -0,0 +1,40 @@
 +/*-