- Complete the myri10ge -> mxge name change by doing a mechanical

  s/myri10ge/mxge/g replacement in the myri10ge files.  A few contuation
  lines were joined because of the regained columns.
- Hook the mxge driver back to the build.

4 files changed, 18 insertions, 18 deletions

diff --git a/sys/modules/mxge/Makefile b/sys/modules/mxge/Makefile
index 7cb1e9d..d9f341b 100644
--- a/sys/modules/mxge/Makefile
+++ b/sys/modules/mxge/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-SUBDIR= myri10ge
-SUBDIR+=myri10ge_eth_z8e
-SUBDIR+=myri10ge_ethp_z8e
+SUBDIR= mxge
+SUBDIR+=mxge_eth_z8e
+SUBDIR+=mxge_ethp_z8e
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/mxge/mxge/Makefile b/sys/modules/mxge/mxge/Makefile
index 0d9ed99..a151d98 100644
--- a/sys/modules/mxge/mxge/Makefile
+++ b/sys/modules/mxge/mxge/Makefile
@@ -1,8 +1,8 @@
 #$FreeBSD$
 
-.PATH: ${.CURDIR}/../../../dev/myri10ge
+.PATH: ${.CURDIR}/../../../dev/mxge
 
-KMOD=	if_myri10ge
-SRCS=	if_myri10ge.c device_if.h bus_if.h pci_if.h
+KMOD=	if_mxge
+SRCS=	if_mxge.c device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile
index f43c81a..ae3cb49 100644
--- a/sys/modules/mxge/mxge_eth_z8e/Makefile
+++ b/sys/modules/mxge/mxge_eth_z8e/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-MYRI10GE= ${.CURDIR}/../../../dev/myri10ge
-.PATH= ${MYRI10GE}
-KMOD=	myri10ge_eth_z8e
-FIRMWS=	eth_z8e.dat:myri10ge_eth_z8e
+MXGE= ${.CURDIR}/../../../dev/mxge
+.PATH= ${MXGE}
+KMOD=	mxge_eth_z8e
+FIRMWS=	eth_z8e.dat:mxge_eth_z8e
 CLEANFILES+= eth_z8e.dat
 
-eth_z8e.dat: ${MYRI10GE}/eth_z8e.dat.gz.uu
-	uudecode -p < ${MYRI10GE}/eth_z8e.dat.gz.uu \
+eth_z8e.dat: ${MXGE}/eth_z8e.dat.gz.uu
+	uudecode -p < ${MXGE}/eth_z8e.dat.gz.uu \
 		| gzip -dc > ${.TARGET}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile
index 35b169b..54b76c1 100644
--- a/sys/modules/mxge/mxge_ethp_z8e/Makefile
+++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-MYRI10GE= ${.CURDIR}/../../../dev/myri10ge
-.PATH= ${MYRI10GE}
-KMOD=	myri10ge_ethp_z8e
-FIRMWS=	ethp_z8e.dat:myri10ge_ethp_z8e
+MXGE= ${.CURDIR}/../../../dev/mxge
+.PATH= ${MXGE}
+KMOD=	mxge_ethp_z8e
+FIRMWS=	ethp_z8e.dat:mxge_ethp_z8e
 CLEANFILES+= ethp_z8e.dat
 
-ethp_z8e.dat: ${MYRI10GE}/ethp_z8e.dat.gz.uu
-	uudecode -p < ${MYRI10GE}/ethp_z8e.dat.gz.uu \
+ethp_z8e.dat: ${MXGE}/ethp_z8e.dat.gz.uu
+	uudecode -p < ${MXGE}/ethp_z8e.dat.gz.uu \
 		| gzip -dc > ${.TARGET}
 
 .include <bsd.kmod.mk>