Fix the matcd driver for the new world order. This basically just

renames matcdc to matcd.

This change is reported to work by two independent PR originators.
In the absence of further feedback on the freebsd-bugs list, we
may as well get this working for its two users.

PR:		20296
Submitted by:	George Russell <george.russell@clara.net>,
		Remi Guyomarch <rguyom@mail.dotcom.fr>

1 files changed, 9 insertions, 9 deletions

diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 6d105db..9dfae97 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -504,7 +504,7 @@ struct	isa_driver	matcddriver={
 	INTR_TYPE_BIO,
 	matcd_probe,
 	matcd_attach,
-	"matcdc"
+	"matcd"
 };
 COMPAT_ISA_DRIVER(matcd, matcddriver);
 
@@ -1207,7 +1207,7 @@ matcd_probe(struct isa_device *dev)
 		cdevsw_add(&matcd_cdevsw);
 	cdrive=nextcontroller;		/*Controller defined by pass for now*/
 	if (nextcontroller==NUMCTRLRS) {
-		printf("matcdc%d: - Too many interfaces specified in config\n",
+		printf("matcd%d: - Too many interfaces specified in config\n",
 		       nextcontroller);
 		return(0);
 	}
@@ -1224,7 +1224,7 @@ matcd_probe(struct isa_device *dev)
 	}
 
 #ifdef DEBUGPROBE
-	printf("matcdc%d: In probe i %d y %d port %x\n",
+	printf("matcd%d: In probe i %d y %d port %x\n",
 	       nextcontroller,i,y,port);
 #endif /*DEBUGPROBE*/
 #ifdef AUTOHUNT
@@ -1236,7 +1236,7 @@ matcd_probe(struct isa_device *dev)
 		for(i=0;i<(sizeof(port_hints)/sizeof(short));i++) {
 			port=port_hints[i];
 #ifdef DEBUGPROBE
-	printf("matcdc%d: Port hint %x\n",nextcontroller,port);
+	printf("matcd%d: Port hint %x\n",nextcontroller,port);
 #endif /*DEBUGPROBE*/
 			if (port==-1) {
 				dev->id_iobase=-1;	/*Put port ? back*/
@@ -1265,7 +1265,7 @@ matcd_probe(struct isa_device *dev)
 	}
 #else /*AUTOHUNT*/
 	if (port==-1) {
-		printf("matcdc%d: AUTOHUNT disabled but port? specified in config\n",
+		printf("matcd%d: AUTOHUNT disabled but port? specified in config\n",
 		       nextcontroller);
 		return(0);
 	}
@@ -1315,7 +1315,7 @@ int doprobe(int port,int cdrive)
 			inb(port+CMD);	/*<20>Read status byte*/
 		}
 #ifdef DEBUGPROBE
-		printf("matcdc%d: Probe found something\n",nextcontroller);
+		printf("matcd%d: Probe found something\n",nextcontroller);
 #endif /*DEBUGPROBE*/
 /*------Don't change anything below this line - see license -----------------*/
 		if (drivepresent==0) {	/*Don't change*/
@@ -1330,7 +1330,7 @@ int doprobe(int port,int cdrive)
 		return(0);		/*Drive 0 detected*/
 	}
 #ifdef DEBUGPROBE
-	printf("matcdc%d: Probe DID NOT find something\n",nextcontroller);
+	printf("matcd%d: Probe DID NOT find something\n",nextcontroller);
 #endif /*DEBUGPROBE*/
 	return(1);
 }
@@ -1356,10 +1356,10 @@ matcd_attach(struct isa_device *dev)
 	int port = dev->id_iobase;	/*Take port ID selected in probe()*/
 
 #ifdef DEBUGPROBE
-	printf("matcdc: Attach dev %x id_unit %d\n",
+	printf("matcd: Attach dev %x id_unit %d\n",
 	       (unsigned int)dev,dev->id_unit);
 #endif /*DEBUGPROBE*/
-	printf("matcdc%d Host interface type %d\n",
+	printf("matcd%d Host interface type %d\n",
 		nextcontroller,iftype);
 	bioq_init(&request_head[nextcontroller]);
 	for (cdrive=0; cdrive<4; cdrive++) {	/*We're hunting drives...*/