28 files changed, 78 insertions, 78 deletions

diff --git a/sys/dev/atapi/atapiconf.c b/sys/dev/atapi/atapiconf.c
index 79654704b9f..efe377df068 100644
--- a/sys/dev/atapi/atapiconf.c
+++ b/sys/dev/atapi/atapiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atapiconf.c,v 1.11 1996/09/12 02:36:10 downsj Exp $	*/
+/*	$OpenBSD: atapiconf.c,v 1.12 1996/11/23 21:46:29 kstailey Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -68,7 +68,7 @@ void at_print_addr __P((struct at_dev_link *, u_int8_t));
 int atapibusmatch __P((struct device *, void *, void *));
 void atapibusattach __P((struct device *, struct device *, void *));
 void atapi_fixquirk __P((struct at_dev_link *));
-int atapiprint __P((void *, char *));
+int atapiprint __P((void *, const char *));
 
 struct cfattach atapibus_ca = {
 	sizeof(struct atapibus_softc), atapibusmatch, atapibusattach
@@ -169,7 +169,7 @@ atapi_fixquirk(ad_link)
 int
 atapiprint(aux, bus)
 	void *aux;
-	char *bus;
+	const char *bus;
 {
 	struct at_dev_link *ad_link = aux;
 	struct atapi_identify *id = &ad_link->id;
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 0052eb1825b..beb94e6b059 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha1742.c,v 1.12 1996/11/12 20:30:07 niklas Exp $	*/
+/*	$OpenBSD: aha1742.c,v 1.13 1996/11/23 21:46:30 kstailey Exp $	*/
 /*	$NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $	*/
 
 /*
@@ -294,7 +294,7 @@ int ahb_scsi_cmd __P((struct scsi_xfer *));
 void ahb_timeout __P((void *));
 void ahb_print_ecb __P((struct ahb_ecb *));
 void ahb_print_active_ecb __P((struct ahb_softc *));
-int ahbprint __P((void *, char *));
+int ahbprint __P((void *, const char *));
 
 #define	MAX_SLOTS	15
 int     ahb_debug = 0;
@@ -457,7 +457,7 @@ ahbmatch(parent, match, aux)
 int
 ahbprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	return UNCONF;
 }
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index d774725cd31..e62ff898dd8 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa.c,v 1.4 1996/11/12 20:30:09 niklas Exp $	*/
+/*	$OpenBSD: eisa.c,v 1.5 1996/11/23 21:46:31 kstailey Exp $	*/
 /*	$NetBSD: eisa.c,v 1.11 1996/04/09 22:46:11 cgd Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct cfdriver eisa_cd = {
 };
 
 int	eisasubmatch __P((struct device *, void *, void *));
-int	eisaprint __P((void *, char *));
+int	eisaprint __P((void *, const char *));
 void	eisa_devinfo __P((const char *, char *));
 
 int
@@ -83,7 +83,7 @@ eisamatch(parent, match, aux)
 int
 eisaprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	register struct eisa_attach_args *ea = aux;
 	char devinfo[256]; 
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 82c1d5bbaf9..0e70cd8be6f 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.12 1996/11/12 20:30:15 niklas Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.13 1996/11/23 21:46:33 kstailey Exp $	*/
 
 /*
  * Generic driver for the aic7xxx based adaptec SCSI controllers
@@ -577,12 +577,12 @@ ahc_scsirate(ahc, scsirate, period, offset, channel, target )
 }
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-int	ahcprint __P((void *, char *));
+int	ahcprint __P((void *, const char *));
 
 int
 ahcprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 
 	if (name != NULL)
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 69781e00ed3..2368691d303 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.26 1996/10/16 12:29:48 deraadt Exp $	*/
+/*	$OpenBSD: aha.c,v 1.27 1996/11/23 21:46:35 kstailey Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -172,7 +172,7 @@ struct scsi_device aha_dev = {
 
 int	ahaprobe __P((struct device *, void *, void *));
 void	ahaattach __P((struct device *, struct device *, void *));
-int	ahaprint __P((void *, char *));
+int	ahaprint __P((void *, const char *));
 
 struct cfattach aha_ca = {
 	sizeof(struct aha_softc), ahaprobe, ahaattach
@@ -357,7 +357,7 @@ ahaprobe(parent, match, aux)
 int
 ahaprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 
 	if (name != NULL)
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index 9ce8e590f43..203c32051ee 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.9 1996/05/26 00:27:11 deraadt Exp $ */
+/*	$OpenBSD: aic6360.c,v 1.10 1996/11/23 21:46:36 kstailey Exp $ */
 /*	$NetBSD: aic6360.c,v 1.46 1996/05/12 23:51:37 mycroft Exp $	*/
 
 #define	integrate	static inline
@@ -582,7 +582,7 @@ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */
 
 int	aicprobe	__P((struct device *, void *, void *));
 void	aicattach	__P((struct device *, struct device *, void *));
-int	aicprint	__P((void *, char *));
+int	aicprint	__P((void *, const char *));
 void	aic_minphys	__P((struct buf *));
 int	aicintr		__P((void *));
 void 	aic_init	__P((struct aic_softc *));
@@ -756,7 +756,7 @@ aic_find(sc)
 int
 aicprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	if (name != NULL)
 		printf("%s: scsibus ", name);
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 2353dd42e60..f4411947118 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.13 1996/11/12 20:30:25 niklas Exp $	*/
+/*	$OpenBSD: ast.c,v 1.14 1996/11/23 21:46:37 kstailey Exp $	*/
 /*	$NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ struct ast_softc {
 int astprobe __P((struct device *, void *, void *));
 void astattach __P((struct device *, struct device *, void *));
 int astintr __P((void *));
-int astprint __P((void *, char *));
+int astprint __P((void *, const char *));
 
 struct cfattach ast_ca = {
 	sizeof(struct ast_softc), astprobe, astattach
@@ -128,7 +128,7 @@ out:
 int
 astprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	struct commulti_attach_args *ca = aux;
 
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 1f868b8e133..6760e5ac5f8 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boca.c,v 1.11 1996/11/12 20:30:26 niklas Exp $ */
+/*	$OpenBSD: boca.c,v 1.12 1996/11/23 21:46:38 kstailey Exp $ */
 /*	$NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ struct boca_softc {
 int bocaprobe __P((struct device *, void *, void *));
 void bocaattach __P((struct device *, struct device *, void *));
 int bocaintr __P((void *));
-int bocaprint __P((void *, char *));
+int bocaprint __P((void *, const char *));
 
 struct cfattach boca_ca = {
 	sizeof(struct boca_softc), bocaprobe, bocaattach,
@@ -128,7 +128,7 @@ out:
 int
 bocaprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	struct commulti_attach_args *ca = aux;
 
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index 67c162527fe..222bdf4a446 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -168,7 +168,7 @@ struct scsi_device bt_dev = {
 
 int	btprobe __P((struct device *, void *, void *));
 void	btattach __P((struct device *, struct device *, void *));
-int	btprint __P((void *, char *));
+int	btprint __P((void *, const char *));
 
 struct cfattach bt_ca = {
 	sizeof(struct bt_softc), btprobe, btattach
@@ -345,7 +345,7 @@ btprobe(parent, match, aux)
 int
 btprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 
 	if (name != NULL)
diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c
index 876bd7ed0a8..a53d72e2c49 100644
--- a/sys/dev/isa/fdc.c
+++ b/sys/dev/isa/fdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdc.c,v 1.6 1996/11/12 20:30:32 niklas Exp $	*/
+/*	$OpenBSD: fdc.c,v 1.7 1996/11/23 21:46:40 kstailey Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -96,7 +96,7 @@ struct cfdriver fdc_cd = {
 	NULL, "fdc", DV_DULL
 };
 
-int fddprint __P((void *, char *));
+int fddprint __P((void *, const char *));
 int fdcintr __P((void *));
 
 int
@@ -242,7 +242,7 @@ fdcattach(parent, self, aux)
 int
 fddprint(aux, fdc)
 	void *aux;
-	char *fdc;
+	const char *fdc;
 {
 	register struct fdc_attach_args *fa = aux;
 
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 23f05025c4a..9401e9f064d 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa.c,v 1.18 1996/10/31 01:05:08 niklas Exp $	*/
+/*	$OpenBSD: isa.c,v 1.19 1996/11/23 21:46:41 kstailey Exp $	*/
 /*	$NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $	*/
 
 /*-
@@ -107,7 +107,7 @@ isaattach(parent, self, aux)
 int
 isaprint(aux, isa)
 	void *aux;
-	char *isa;
+	const char *isa;
 {
 	struct isa_attach_args *ia = aux;
 
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 6ca10a1095b..9eb0b6f030c 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma.c,v 1.8 1996/10/16 12:32:36 deraadt Exp $	*/
+/*	$OpenBSD: isadma.c,v 1.9 1996/11/23 21:46:41 kstailey Exp $	*/
 /*	$NetBSD: isadma.c,v 1.19 1996/04/29 20:03:26 christos Exp $	*/
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@ static u_int8_t dmamode[4] = {
 
 int isadmamatch __P((struct device *, void *, void *));
 void isadmaattach __P((struct device *, struct device *, void *));
-int isadmaprint __P((void *, char *));
+int isadmaprint __P((void *, const char *));
 
 struct cfattach isadma_ca = {
 	sizeof(struct device), isadmamatch, isadmaattach
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index 66c00e1a6d4..e7d43f8aa72 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp.c,v 1.7 1996/11/12 20:30:39 niklas Exp $	*/
+/*	$OpenBSD: isapnp.c,v 1.8 1996/11/23 21:46:42 kstailey Exp $	*/
 
 /*
  * Copyright (c) 1996, Shawn Hsiao <shawn@alpha.secc.fju.edu.tw>
@@ -74,7 +74,7 @@
 
 int isapnpmatch __P((struct device *, void *, void *));
 void isapnpattach __P((struct device *, struct device *, void *));
-int isapnpprint __P((void *aux, char *pnp));
+int isapnpprint __P((void *aux, const char *pnp));
 int isapnpsubmatch __P((struct device *parent, void *match, void *aux));
 
 struct isapnp_softc {
@@ -226,7 +226,7 @@ postisapnpattach(parent, self, aux)
 int
 isapnpprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	register struct isa_attach_args *ia = aux;
 	unsigned char info[4];
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 61137d1945a..1a79d7e9f84 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isavar.h,v 1.18 1996/11/12 20:30:40 niklas Exp $	*/
+/*	$OpenBSD: isavar.h,v 1.19 1996/11/23 21:46:43 kstailey Exp $	*/
 /*	$NetBSD: isavar.h,v 1.23 1996/05/08 23:32:31 thorpej Exp $	*/
 
 /*
@@ -185,7 +185,7 @@ struct isa_softc {
 char	*isa_intr_typename __P((int type));
 
 void	isascan __P((struct device *parent, void *match));
-int	isaprint __P((void *, char *));
+int	isaprint __P((void *, const char *));
 
 #ifdef NEWCONFIG
 /*
diff --git a/sys/dev/isa/pcmcia_isa.c b/sys/dev/isa/pcmcia_isa.c
index da4d0d5ffa1..34b7cabb122 100644
--- a/sys/dev/isa/pcmcia_isa.c
+++ b/sys/dev/isa/pcmcia_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia_isa.c,v 1.7 1996/10/18 15:43:06 deraadt Exp $	*/
+/*	$OpenBSD: pcmcia_isa.c,v 1.8 1996/11/23 21:46:44 kstailey Exp $	*/
 /*
  * Copyright (c) 1995,1996 John T. Kohl.  All rights reserved.
  * Copyright (c) 1994 Stefan Grefen.  All rights reserved.
@@ -158,7 +158,7 @@ pcmcia_isa_probe(parent, match, aux, pc_link)
 #endif
 	if ((probe == NULL ? (*cf->cf_attach->ca_match)(parent, dev, &ia) :
 	    (*probe)(parent, dev, &ia, pc_link)) > 0) {
-		extern int isaprint __P((void *, char *));
+		extern int isaprint __P((void *, const char *));
 
 		config_attach(parent, dev, &ia, isaprint);
 #ifdef PCMCIA_ISA_DEBUG
diff --git a/sys/dev/isa/pcmcia_pcic.c b/sys/dev/isa/pcmcia_pcic.c
index 5e0bfeb98ee..1170e16795d 100644
--- a/sys/dev/isa/pcmcia_pcic.c
+++ b/sys/dev/isa/pcmcia_pcic.c
@@ -1,4 +1,4 @@
-/*	$Id: pcmcia_pcic.c,v 1.8 1996/10/23 16:41:58 deraadt Exp $	*/
+/*	$Id: pcmcia_pcic.c,v 1.9 1996/11/23 21:46:44 kstailey Exp $	*/
 /*
  *  Copyright (c) 1995, 1996 John T. Kohl
  *  All rights reserved.
@@ -133,11 +133,11 @@ static struct pcmcia_funcs pcic_funcs = {
 
 int pcic_probe __P((struct device *, void *, void *));
 void pcic_attach __P((struct device  *, struct device *, void *));
-int pcic_print __P((void *, char *));
+int pcic_print __P((void *, const char *));
 
 int pcicmaster_probe __P((struct device *, void *, void *));
 void pcicmaster_attach __P((struct device  *, struct device *, void *));
-int pcicmaster_print __P((void *, char *));
+int pcicmaster_print __P((void *, const char *));
 
 extern struct pcmciabus_link pcmcia_isa_link;
 
@@ -345,7 +345,7 @@ pcic_intr __P((void *));
 int
 pcic_print(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	if (name != NULL)       
 		printf("%s: pcmciabus ", name);
@@ -1053,7 +1053,7 @@ pcicmaster_attach(parent, self, aux)
 int
 pcicmaster_print(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	if (name != NULL)       
 		printf("%s: master controller ", name);
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index d1ff59cdf8c..d8e87928a33 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtfps.c,v 1.12 1996/11/12 20:30:42 niklas Exp $       */
+/*	$OpenBSD: rtfps.c,v 1.13 1996/11/23 21:46:45 kstailey Exp $       */
 /*	$NetBSD: rtfps.c,v 1.23 1996/05/12 23:53:29 mycroft Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ struct rtfps_softc {
 int rtfpsprobe __P((struct device *, void *, void *));
 void rtfpsattach __P((struct device *, struct device *, void *));
 int rtfpsintr __P((void *));
-int rtfpsprint __P((void *, char *));
+int rtfpsprint __P((void *, const char *));
 
 struct cfattach rtfps_ca = {
 	sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach
@@ -130,7 +130,7 @@ out:
 int
 rtfpsprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	struct commulti_attach_args *ca = aux;
 
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index add9c513f09..0f90e391bb4 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -304,7 +304,7 @@ struct scsi_device sea_dev = {
 
 int	seaprobe __P((struct device *, void *, void *));
 void	seaattach __P((struct device *, struct device *, void *));
-int	seaprint __P((void *, char *));
+int	seaprint __P((void *, const char *));
 
 struct cfattach sea_ca = {
 	sizeof(struct sea_softc), seaprobe, seaattach
@@ -411,7 +411,7 @@ seaprobe(parent, match, aux)
 int
 seaprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	if (name != NULL)       
 		printf("%s: scsibus ", name);
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index 50e604c301b..3b8a340243d 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultra14f.c,v 1.15 1996/05/26 00:27:30 deraadt Exp $	*/
+/*	$OpenBSD: ultra14f.c,v 1.16 1996/11/23 21:46:47 kstailey Exp $	*/
 /*	$NetBSD: ultra14f.c,v 1.66 1996/05/12 23:53:54 mycroft Exp $	*/
 
 /*
@@ -330,7 +330,7 @@ struct scsi_device uha_dev = {
 
 int	uhaprobe __P((struct device *, void *, void *));
 void	uhaattach __P((struct device *, struct device *, void *));
-int	uhaprint __P((void *, char *));
+int	uhaprint __P((void *, const char *));
 
 struct cfattach uha_ca = {
 	sizeof(struct uha_softc), uhaprobe, uhaattach
@@ -578,7 +578,7 @@ uhaprobe(parent, match, aux)
 int
 uhaprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	if (name != NULL)       
 		printf("%s: scsibus ", name);
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 1bcb02de03e..810b6412091 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.20 1996/11/12 20:30:43 niklas Exp $	*/
+/*	$OpenBSD: wd.c,v 1.21 1996/11/23 21:46:48 kstailey Exp $	*/
 /*	$NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -82,7 +82,7 @@ struct wd_softc {
 
 int	wdprobe		__P((struct device *, void *, void *));
 void	wdattach	__P((struct device *, struct device *, void *));
-int	wdprint		__P((void *, char *));
+int	wdprint		__P((void *, const char *));
 
 struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach
diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c
index 00a513b79d2..687edb41343 100644
--- a/sys/dev/isa/wdc.c
+++ b/sys/dev/isa/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.14 1996/11/12 20:30:45 niklas Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.15 1996/11/23 21:46:49 kstailey Exp $	*/
 /*	$NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -85,7 +85,7 @@
 LIST_HEAD(xfer_free_list, wdc_xfer) xfer_free_list;
 
 int	wdcprobe	__P((struct device *, void *, void *));
-int	wdcprint	__P((void *, char *));
+int	wdcprint	__P((void *, const char *));
 void	wdcattach	__P((struct device *, struct device *, void *));
 int	wdcintr		__P((void *));
 
@@ -198,7 +198,7 @@ wdcprobe(parent, match, aux)
 int
 wdcprint(aux, wdc)
 	void *aux;
-	char *wdc;
+	const char *wdc;
 {
 	struct wd_link *d_link = aux;
 
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 603a5efd42c..fb67adbebaf 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.9 1996/11/12 20:30:46 niklas Exp $	*/
+/*	$OpenBSD: wds.c,v 1.10 1996/11/23 21:46:49 kstailey Exp $	*/
 /*	$NetBSD: wds.c,v 1.7 1996/05/12 23:54:09 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -185,7 +185,7 @@ struct scsi_device wds_dev = {
 
 int	wdsprobe __P((struct device *, void *, void *));
 void	wdsattach __P((struct device *, struct device *, void *));
-int	wdsprint __P((void *, char *));
+int	wdsprint __P((void *, const char *));
 
 struct cfattach wds_ca = {
 	sizeof(struct wds_softc), wdsprobe, wdsattach
@@ -262,7 +262,7 @@ wdsprobe(parent, match, aux)
 int
 wdsprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 
 	if (name != NULL)
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 0cf2491fed0..f6043155c43 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.18 1996/11/12 20:30:57 niklas Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.19 1996/11/23 21:47:04 kstailey Exp $	*/
 /*	$NetBSD: ncr.c,v 1.35.4.1 1996/06/03 20:32:17 cgd Exp $	*/
 
 /**************************************************************************
@@ -3356,12 +3356,12 @@ static	char* ncr_probe (pcici_t tag, pcidi_t type)
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 
-int ncr_print __P((void *, char *));
+int ncr_print __P((void *, const char *));
 
 int
 ncr_print(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 
 	if (name != NULL)
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index e88e710b1d3..0d2f6061d0b 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.3 1996/05/07 07:38:49 deraadt Exp $	*/
+/*	$OpenBSD: pci.c,v 1.4 1996/11/23 21:47:05 kstailey Exp $	*/
 /*	$NetBSD: pci.c,v 1.19 1996/05/03 17:33:49 christos Exp $	*/
 
 /*
@@ -53,7 +53,7 @@ struct cfdriver pci_cd = {
 	NULL, "pci", DV_DULL
 };
 
-int	pciprint __P((void *, char *));
+int	pciprint __P((void *, const char *));
 int	pcisubmatch __P((struct device *, void *, void *));
 
 int
@@ -161,7 +161,7 @@ pciattach(parent, self, aux)
 int
 pciprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	register struct pci_attach_args *pa = aux;
 	char devinfo[256];
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 87a6b1c0eeb..09a8b969cec 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppb.c,v 1.3 1996/05/07 07:38:51 deraadt Exp $	*/
+/*	$OpenBSD: ppb.c,v 1.4 1996/11/23 21:47:06 kstailey Exp $	*/
 /*	$NetBSD: ppb.c,v 1.8 1996/05/03 17:33:51 christos Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct cfdriver ppb_cd = {
 	NULL, "ppb", DV_DULL
 };
 
-int	ppbprint __P((void *, char *pnp));
+int	ppbprint __P((void *, const char *pnp));
 
 int
 ppbmatch(parent, match, aux)
@@ -132,7 +132,7 @@ ppbattach(parent, self, aux)
 int
 ppbprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	struct pcibus_attach_args *pba = aux;
 
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 16a5df7f413..572bf77726c 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/*	$Id: pcmcia.c,v 1.6 1996/10/16 12:36:54 deraadt Exp $	*/
+/*	$Id: pcmcia.c,v 1.7 1996/11/23 21:47:07 kstailey Exp $	*/
 /*
  * Copyright (c) 1996 John T. Kohl.  All rights reserved.
  * Copyright (c) 1994 Stefan Grefen.  All rights reserved.
@@ -101,7 +101,7 @@ int  pcmcia_mapcard_and_configure __P((struct pcmcia_link *, int,
 int pcmcia_unconfigure __P((struct pcmcia_link *));
 int pcmcia_unmapcard __P((struct pcmcia_link *));
 
-int pcmcia_print __P((void *, char *));
+int pcmcia_print __P((void *, const char *));
 int pcmcia_submatch __P((struct device *, void *, void *));
 void pcmcia_probe_link __P((struct pcmcia_link *));
 
@@ -1317,7 +1317,7 @@ pcmciadumpcf(cf)
 int
 pcmcia_print(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 #if 0
 	struct pcmcia_attach_args *paa = aux;
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c
index 3e9c5939be0..16086da694a 100644
--- a/sys/dev/tc/asc.c
+++ b/sys/dev/tc/asc.c
@@ -461,7 +461,7 @@ extern u_long asc_iomem;
  */
 int	ascmatch  __P((struct device * parent, void *cfdata, void *aux));
 void	ascattach __P((struct device *parent, struct device *self, void *aux));
-int	ascprint(void*, char*);
+int	ascprint(void*, const char*);
 
 struct cfattach asc_ca = {
 	sizeof(struct asc_softc), ascmatch, ascattach
@@ -692,7 +692,7 @@ ascattach(parent, self, aux)
 int
 ascprint(aux, name)
 	void *aux;
-	char *name;
+	const char *name;
 {
 	return -1;
 }
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index 5474b1c9bed..dc1d61f37eb 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc.c,v 1.7 1996/10/31 01:05:13 niklas Exp $	*/
+/*	$OpenBSD: tc.c,v 1.8 1996/11/23 21:47:10 kstailey Exp $	*/
 /*	$NetBSD: tc.c,v 1.16 1996/05/17 23:39:19 cgd Exp $	*/
 
 /*
@@ -62,7 +62,7 @@ struct cfdriver tc_cd = {
 	NULL, "tc", DV_DULL
 };
 
-int	tcprint __P((void *, char *));
+int	tcprint __P((void *, const char *));
 int	tcsubmatch __P((struct device *, void *, void *));
 int	tc_checkslot __P((tc_addr_t, char *));
 void	tc_devinfo __P((const char *, char *));
@@ -194,7 +194,7 @@ tcattach(parent, self, aux)
 int
 tcprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	struct tc_attach_args *ta = aux;
 	char devinfo[256];