From 74cfa48c7d076a2b702bc5c02a50e508aa32de2a Mon Sep 17 00:00:00 2001
From: augustss <augustss@NetBSD.org>
Date: Thu, 13 Jun 2002 15:27:23 +0000
Subject: [PATCH] Use consistent naming.

---
 sys/dev/ic/cpc700.c       | 12 ++++++------
 sys/dev/ic/iic_cpcbus.c   |  4 ++--
 sys/dev/ic/timer_cpcbus.c |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/dev/ic/cpc700.c b/sys/dev/ic/cpc700.c
index 3e45ec0b3574..70d0ed8f1748 100644
--- a/sys/dev/ic/cpc700.c
+++ b/sys/dev/ic/cpc700.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpc700.c,v 1.1 2002/05/21 02:58:25 augustss Exp $	*/
+/*	$NetBSD: cpc700.c,v 1.2 2002/06/13 15:27:23 augustss Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -147,11 +147,11 @@ cpc_attach(struct device *self, pci_chipset_tag_t pc, bus_space_tag_t mem,
 		bus_addr_t addr;
 		int irq;
 	} devs[] = {
-		{ "com", CPC_COM0, CPC_IB_UART_0 },
-		{ "com", CPC_COM1, CPC_IB_UART_1 },
-		{ "timer", CPC_TIMER, CPCBUSCF_IRQ_DEFAULT },
-		{ "iic", CPC_IIC0, CPC_IB_IIC_0 },
-		{ "iic", CPC_IIC1, CPC_IB_IIC_1 },
+		{ "com",    CPC_COM0, CPC_IB_UART_0 },
+		{ "com",    CPC_COM1, CPC_IB_UART_1 },
+		{ "cpctim", CPC_TIMER, CPCBUSCF_IRQ_DEFAULT },
+		{ "cpciic", CPC_IIC0, CPC_IB_IIC_0 },
+		{ "cpciic", CPC_IIC1, CPC_IB_IIC_1 },
 		{ NULL, 0 }
 	};
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
diff --git a/sys/dev/ic/iic_cpcbus.c b/sys/dev/ic/iic_cpcbus.c
index aded723c7252..ff7601e7f84b 100644
--- a/sys/dev/ic/iic_cpcbus.c
+++ b/sys/dev/ic/iic_cpcbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iic_cpcbus.c,v 1.1 2002/05/21 02:58:25 augustss Exp $	*/
+/*	$NetBSD: iic_cpcbus.c,v 1.2 2002/06/13 15:27:23 augustss Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ iic_cpcbus_match(struct device *parent, struct cfdata *cf, void *aux)
 {
 	struct cpcbus_attach_args *caa = aux;
 
-	return (strcmp(caa->cpca_name, "iic") == 0);
+	return (strcmp(caa->cpca_name, "cpciic") == 0);
 }
 
 void
diff --git a/sys/dev/ic/timer_cpcbus.c b/sys/dev/ic/timer_cpcbus.c
index 4557f0e321c3..2c021aa2fbdf 100644
--- a/sys/dev/ic/timer_cpcbus.c
+++ b/sys/dev/ic/timer_cpcbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer_cpcbus.c,v 1.1 2002/05/21 02:58:25 augustss Exp $	*/
+/*	$NetBSD: timer_cpcbus.c,v 1.2 2002/06/13 15:27:23 augustss Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ cpctim_match(struct device *parent, struct cfdata *cf, void *aux)
 {
 	struct cpcbus_attach_args *caa = aux;
 
-	return (strcmp(caa->cpca_name, "timer") == 0);
+	return (strcmp(caa->cpca_name, "cpctim") == 0);
 }
 
 void