From a246f097d608ffd15198c0933258e5cd2604c1f8 Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Mon, 9 Aug 2004 06:45:20 +0000
Subject: [PATCH] change the name of the md module, to g_md, introduce a define
 with the name MD_MODNAME, and make mdconfig use this new define...

---
 sbin/mdconfig/mdconfig.c | 2 +-
 sys/modules/md/Makefile  | 2 +-
 sys/sys/mdioctl.h        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index d83148dc1d70..0fb47bcd1300 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -292,7 +292,7 @@ mdmaybeload(void)
         const char *name;
 	char *cp;
 
-	name = MD_NAME;
+	name = MD_MODNAME;
         /* scan files in kernel */
         mstat.version = sizeof(struct module_stat);
         for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid)) {
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index 6ca6dbfe6f23..3f0654fbbe63 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../dev/md
 
-KMOD=	md
+KMOD=	g_md
 SRCS=	md.c opt_md.h opt_geom.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index e02a82b5114d..4243f49e18ea 100644
--- a/sys/sys/mdioctl.h
+++ b/sys/sys/mdioctl.h
@@ -65,6 +65,7 @@ struct md_ioctl {
 };
 
 #define MD_NAME		"md"
+#define MD_MODNAME	"g_md"
 #define MDCTL_NAME	"mdctl"
 #define MDIOVERSION	0