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

[Aurelien Jarno]

Author: aurel32
Date: 2006-11-03 23:51:43 +0100 (Fri, 03 Nov 2006)
New Revision: 1703

Modified:
   trunk/kfreebsd-6/debian/patches/000_nfe.diff
Log:
Activation of the nForce driver, and upload to unreleased



Modified: trunk/kfreebsd-6/debian/patches/000_nfe.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_nfe.diff	2006-11-03 17:30:57 UTC (rev 1702)
+++ trunk/kfreebsd-6/debian/patches/000_nfe.diff	2006-11-03 22:51:43 UTC (rev 1703)
@@ -2613,6 +2613,38 @@
 +	u_int16_t	dev_id;
 +	char		*name;
 +};
+diff -Nurd sys/modules/nfe/Makefile sys/modules/nfe/Makefile
+--- sys/modules/nfe/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ sys/modules/nfe/Makefile	2006-11-03 08:53:03.000000000 +0100
+@@ -0,0 +1,6 @@
++.PATH: ${.CURDIR}/../../dev/nfe
++
++KMOD=	if_nfe
++SRCS=	if_nfe.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
++
++.include <bsd.kmod.mk>
+diff -Nurd sys/modules/Makefile sys/modules/Makefile 
+--- sys/modules/Makefile	2006-11-03 13:44:50.000000000 +0100
++++ sys/modules/Makefile	2006-11-03 15:29:22.000000000 +0100
+@@ -161,6 +161,7 @@
+ 	${_ncv} \
+ 	${_ndis} \
+ 	netgraph \
++	nfe \
+ 	nfsclient \
+ 	nfsserver \
+ 	nge \
+diff -Nurd sys/amd64/conf/GENERIC sys/amd64/conf/GENERIC
+--- sys/amd64/conf/GENERIC	2006-11-03 21:20:25.000000000 +0100
++++ sys/amd64/conf/GENERIC	2006-11-03 21:21:04.000000000 +0100
+@@ -181,6 +181,7 @@
+ device		dc		# DEC/Intel 21143 and various workalikes
+ device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+ device		lge		# Level 1 LXT1001 gigabit Ethernet
++device		nfe		# NVIDIA nForce MCP Ethernet
+ device		nge		# NatSemi DP83820 gigabit Ethernet
+ device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+ device		re		# RealTek 8139C+/8169/8169S/8110S
 diff -Nurd sys/i386/conf/GENERIC sys/i386/conf/GENERIC
 --- sys/i386/conf/GENERIC	2006-11-03 09:00:17.000000000 +0100
 +++ sys/i386/conf/GENERIC	2006-11-03 08:55:46.000000000 +0100
@@ -2620,20 +2652,10 @@
  device		dc		# DEC/Intel 21143 and various workalikes
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
-+device		nfe		# NVidia NForce 3/4
++device		nfe		# NVidia nForce MCP Ethernet
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
  device		re		# RealTek 8139C+/8169/8169S/8110S
-diff -Nurd sys/modules/nfe/Makefile sys/modules/nfe/Makefile
---- sys/modules/nfe/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ sys/modules/nfe/Makefile	2006-11-03 08:53:03.000000000 +0100
-@@ -0,0 +1,6 @@
-+.PATH: ${.CURDIR}/../../dev/nfe
-+
-+KMOD=	if_nfe
-+SRCS=	if_nfe.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
-+
-+.include <bsd.kmod.mk>
 diff -Nurd sys/pc98/conf/GENERIC sys/pc98/conf/GENERIC
 --- sys/pc98/conf/GENERIC	2006-11-03 09:00:04.000000000 +0100
 +++ sys/pc98/conf/GENERIC	2006-11-03 08:55:51.000000000 +0100
@@ -2645,14 +2667,14 @@
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
  device		re		# RealTek 8139C+/8169/8169S/8110S
-diff -Nurd sys/modules/Makefile sys/modules/Makefile 
---- sys/modules/Makefile	2006-11-03 13:44:50.000000000 +0100
-+++ sys/modules/Makefile	2006-11-03 15:29:22.000000000 +0100
-@@ -161,6 +161,7 @@
- 	${_ncv} \
- 	${_ndis} \
- 	netgraph \
-+	nfe \
- 	nfsclient \
- 	nfsserver \
- 	nge \
+diff -Nurd sys/conf/files sys/conf/files
+--- sys/conf/files	2006-11-03 21:26:25.000000000 +0100
++++ sys/conf/files	2006-11-03 21:30:19.000000000 +0100
+@@ -693,6 +693,7 @@
+ dev/my/if_my.c			optional my
+ dev/ncv/ncr53c500.c		optional ncv
+ dev/ncv/ncr53c500_pccard.c	optional ncv pccard
++dev/nfe/if_nfe.c		optional nfe
+ dev/nge/if_nge.c		optional nge
+ dev/nmdm/nmdm.c			optional nmdm
+ dev/nsp/nsp.c			optional nsp