diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 593b30579fe4..f05c164ff455 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
+ *	$Id: adv_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $
  */
 
 #include <pci.h>
@@ -76,7 +76,7 @@
 #define ADV_PCI_MAX_DMA_ADDR    (0xFFFFFFFFL)
 #define ADV_PCI_MAX_DMA_COUNT   (0xFFFFFFFFL)
 
-static char* advpciprobe(pcici_t tag, pcidi_t type);
+static const char* advpciprobe(pcici_t tag, pcidi_t type);
 static void advpciattach(pcici_t config_id, int unit);
 
 /* 
@@ -97,7 +97,7 @@ static struct  pci_device adv_pci_driver = {
 
 DATA_SET (pcidevice_set, adv_pci_driver);
 
-static  char*
+static const char*
 advpciprobe(pcici_t tag, pcidi_t type)
 {
 	int rev = pci_conf_read(tag, PCI_CLASS_REG) & 0xff;
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index eb941bf6a8e3..b65037bdba6b 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
+ *	$Id: adw_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $
  */
 
 #include <pci.h>
@@ -58,7 +58,7 @@
 #define ADW_PCI_MAX_DMA_ADDR    (0xFFFFFFFFUL)
 #define ADW_PCI_MAX_DMA_COUNT   (0xFFFFFFFFUL)
 
-static char* adwpciprobe(pcici_t tag, pcidi_t type);
+static const char* adwpciprobe(pcici_t tag, pcidi_t type);
 static void adwpciattach(pcici_t config_id, int unit);
 
 static struct  pci_device adw_pci_driver = {
@@ -71,7 +71,7 @@ static struct  pci_device adw_pci_driver = {
 
 DATA_SET (pcidevice_set, adw_pci_driver);
 
-static  char*
+static const char*
 adwpciprobe(pcici_t tag, pcidi_t type)
 {
 	switch (type) {
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index d4de62ef95cc..7ad19534854a 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
+/* $Id: brooktree848.c,v 1.60 1998/12/07 21:58:45 archie Exp $ */
 /* BT848 Driver for Brooktree's Bt848 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -438,7 +438,7 @@ static bktr_reg_t brooktree[ NBKTR ];
 #define MINOR(x)	((x >> 4) & 0x0f)
 #define ATTACH_ARGS	pcici_t tag, int unit
 
-static char*	bktr_probe( pcici_t tag, pcidi_t type );
+static const char*	bktr_probe( pcici_t tag, pcidi_t type );
 static void	bktr_attach( ATTACH_ARGS );
 
 static u_long	bktr_count;
@@ -1127,7 +1127,7 @@ static int	readEEProm( bktr_ptr_t bktr, int offset, int count,
 /*
  * the boot time probe routine.
  */
-static char*
+static const char*
 bktr_probe( pcici_t tag, pcidi_t type )
 {
 	switch (type) {
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 435aff09ee78..3c886d86a462 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.2 1998/10/30 02:06:42 gibbs Exp $
+ *	$Id: bt_pci.c,v 1.3 1998/11/10 06:45:14 gibbs Exp $
  */
 
 #include "pci.h"
@@ -53,7 +53,7 @@
 
 static int btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp,
 				  bus_space_handle_t* bshp);
-static char* bt_pci_probe(pcici_t tag, pcidi_t type);
+static const char* bt_pci_probe(pcici_t tag, pcidi_t type);
 static void bt_pci_attach(pcici_t config_id, int unit);
 
 static struct  pci_device bt_pci_driver = {
@@ -98,7 +98,7 @@ btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp,
 	return (0);
 }
 
-static  char*
+static const char*
 bt_pci_probe (pcici_t config_id, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index ae48965f69e6..a40630841411 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $
+ *	$Id: cy_pci.c,v 1.6 1997/09/02 20:06:24 bde Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
 
 #include <pci/cy_pcireg.h>
 
-static char *cy_probe		__P((pcici_t, pcidi_t));
+static const char *cy_probe		__P((pcici_t, pcidi_t));
 static void cy_attach		__P((pcici_t, int));
 
 extern int cyattach_common(void *, int); /* Not exactly correct */
@@ -61,7 +61,7 @@ static struct pci_device cy_device = {
 };
 DATA_SET(pcidevice_set, cy_device);
 
-static char *
+static const char *
 cy_probe(config_id, device_id)
 	pcici_t config_id;
 	pcidi_t device_id;
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index b704fca7ffba..7bf0e26e3138 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
+#ident "$Id: dpt_pci.c,v 1.10 1998/12/07 21:58:46 archie Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -64,7 +64,7 @@
 
 /* Function Prototypes */
 
-static char    *dpt_pci_probe(pcici_t tag, pcidi_t type);
+static const char    *dpt_pci_probe(pcici_t tag, pcidi_t type);
 static void     dpt_pci_attach(pcici_t config_id, int unit);
 
 extern struct cdevsw dpt_cdevsw;
@@ -86,7 +86,7 @@ DATA_SET(pcidevice_set, dpt_pci_driver);
  * because we do not know for sure how the two relate.
  */
 
-static char *
+static const char *
 dpt_pci_probe(pcici_t tag, pcidi_t type)
 {
 	u_int32_t  class;
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 37db78ed1511..acc6f6338308 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -80,7 +80,7 @@
  */
 
 static	void en_pci_attach __P((pcici_t, int));
-static	char *en_pci_probe __P((pcici_t, pcidi_t));
+static	const char *en_pci_probe __P((pcici_t, pcidi_t));
 #ifdef SHUTDOWN_PRE_SYNC
 static void en_pci_shutdown __P((int, void *));
 #else
@@ -203,7 +203,7 @@ void *v;
  * autoconfig stuff
  */
 
-static char *en_pci_probe(config_id, device_id)
+static const char *en_pci_probe(config_id, device_id)
 
 pcici_t config_id;
 pcidi_t device_id;
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index c3e63b9aae53..8c3e0604c1ac 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.3 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -42,13 +42,13 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $Id: eni.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 /*
  * Typedef local functions
  */
-static char	*eni_pci_probe __P((pcici_t, pcidi_t));
+static const char	*eni_pci_probe __P((pcici_t, pcidi_t));
 static void	eni_pci_attach __P((pcici_t, int));
 static int 	eni_get_ack __P((Eni_unit *));
 static int	eni_get_sebyte __P((Eni_unit *));
@@ -98,7 +98,7 @@ DATA_SET ( pcidevice_set, eni_pci_device );
  *	NULL		unrecognized vendor/device
  *
  */
-static char *
+static const char *
 eni_pci_probe ( pcici_t config_id, pcidi_t device_id )
 {
 
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 96c59be25709..e41370efe5c3 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 
@@ -54,7 +54,7 @@ static int	fore_identify __P((char *));
 static int	fore_attach __P((struct devinfo *));
 #endif
 #ifdef __FreeBSD__
-static char *	fore_pci_probe __P((pcici_t, pcidi_t));
+static const char *	fore_pci_probe __P((pcici_t, pcidi_t));
 static void	fore_pci_attach __P((pcici_t, int));
 #if BSD < 199506
 static int	fore_pci_shutdown __P((struct kern_devconf *, int));
@@ -844,7 +844,7 @@ fore_attach(devinfo_p)
  *	NULL	device not claimed by this driver
  *
  */
-static char *
+static const char *
 fore_pci_probe(config_id, device_id)
 	pcici_t	config_id;
 	pcidi_t	device_id;
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 8619d496ef97..43dad60bb53f 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -129,7 +129,7 @@ static struct ispmdvec mdvec_2100 = {
 #define MEM_MAP_REG	0x14
 
 
-static char *isp_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char *isp_pci_probe __P((pcici_t tag, pcidi_t type));
 static void isp_pci_attach __P((pcici_t config_d, int unit));
 
 /* This distinguishing define is not right, but it does work */
@@ -196,7 +196,7 @@ struct pci_device isp_pci_driver = {
 DATA_SET (pcidevice_set, isp_pci_driver);
 
 
-static char *
+static const char *
 isp_pci_probe(tag, type)
 	pcici_t tag;
 	pcidi_t type;
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 3cffcab8030a..27f2048d4377 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.5 1997/08/02 14:33:11 bde Exp $
+ *	$Id: if_lnc_p.c,v 1.6 1998/07/20 17:33:01 msmith Exp $
  */
 
 #include "pci.h"
@@ -36,7 +36,7 @@
 
 extern void *lnc_attach_ne2100_pci __P((int unit, unsigned iobase));
 
-static char* lnc_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char* lnc_pci_probe __P((pcici_t tag, pcidi_t type));
 static void lnc_pci_attach __P((pcici_t config_id, int unit));
 
 static u_long lnc_pci_count = NLNC;
@@ -51,7 +51,7 @@ static struct pci_device lnc_pci_driver = {
 
 DATA_SET (pcidevice_set, lnc_pci_driver);
 
-static char*
+static const char*
 lnc_pci_probe (pcici_t tag, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index 76d5be42e42a..0648746679d2 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -99,7 +99,7 @@ struct cfattach ohci_pci_ca = {
 
 #define PCI_OHCI_BASE_REG	0x10
 
-static char *ohci_pci_probe              __P((pcici_t, pcidi_t));
+static const char *ohci_pci_probe              __P((pcici_t, pcidi_t));
 static void ohci_pci_attach              __P((pcici_t, int));
 
 u_long ohci_count = 0;           /* global counter for nr. of devices found */
@@ -132,7 +132,7 @@ ohci_pci_match(parent, match, aux)
 	return 0;
 }
 #elif defined(__FreeBSD__)
-static char *
+static const char *
 ohci_pci_probe(pcici_t config_id, pcidi_t device_id)
 {
         u_int32_t class;
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index cfca628398de..f17b9af2747a 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -94,8 +94,8 @@ struct cfattach uhci_pci_ca = {
 
 #define PCI_UHCI_BASE_REG               0x20
 
-static char *uhci_pci_probe              __P((pcici_t, pcidi_t));
-static void uhci_pci_attach              __P((pcici_t, int));
+static const char *uhci_pci_probe	__P((pcici_t, pcidi_t));
+static void uhci_pci_attach		__P((pcici_t, int));
 
 u_long uhci_count = 0;           /* global counter for nr. of devices found */
 
@@ -129,7 +129,7 @@ uhci_pci_match(parent, match, aux)
 }
 
 #elif defined(__FreeBSD__)
-static char *
+static const char *
 uhci_pci_probe(pcici_t config_id, pcidi_t device_id)
 {
 	u_int32_t class;
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 8706f2a06d5c..cff0be24ca84 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.6 1998/02/09 06:10:49 eivind Exp $
+ * $Id: if_fpa.c,v 1.7 1998/02/20 13:11:53 bde Exp $
  *
  */
 
@@ -135,7 +135,7 @@ static void pdq_pci_shutdown(int, void *);
  * on both EISA and PCI boards, one must be careful in how defines the
  * PDQ in the config file.
  */
-static char *
+static const char *
 pdq_pci_probe(
     pcici_t config_id,
     pcidi_t device_id)
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 02a32e089f39..41a5ec3f2cbd 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.5 1997/09/02 20:06:27 bde Exp $
+ * $Id: if_sr_p.c,v 1.6 1998/02/09 06:10:52 eivind Exp $
  */
 
 #include "pci.h"
@@ -54,7 +54,7 @@ extern void *srattach_pci(int unit,
 			  vm_offset_t sca_vaddr);
 extern void srintr_hc(void *hc);
 
-static char *sr_pci_probe(pcici_t tag, pcidi_t type);
+static const char *sr_pci_probe(pcici_t tag, pcidi_t type);
 static void sr_pci_attach(pcici_t config_id, int unit);
 
 static u_long src_count = NSR;
@@ -69,7 +69,7 @@ static struct pci_device sr_pci_driver =
 
 DATA_SET (pcidevice_set, sr_pci_driver);
 
-static char *
+static const char *
 sr_pci_probe(pcici_t tag, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 639a4256242e..a79ebebf602c 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.18 1998/12/07 21:58:46 archie Exp $ */
+/*	$Id: if_tx.c,v 1.19 1998/12/09 01:12:18 eivind Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -360,7 +360,7 @@ epic_shutdown(
 #else /* __FreeBSD__ */
 /* -----------------------------FreeBSD------------------------------------- */
 
-static char* epic_freebsd_probe __P((pcici_t, pcidi_t));
+static const char* epic_freebsd_probe __P((pcici_t, pcidi_t));
 static void epic_freebsd_attach __P((pcici_t, int));
 static void epic_shutdown __P((int, void *));
 
@@ -377,7 +377,7 @@ static struct pci_device txdevice = {
 DATA_SET ( pcidevice_set, txdevice );
 
 /* Synopsis: Check if device id corresponds with SMC83C170 id.  */
-static char*
+static const char*
 epic_freebsd_probe(
     pcici_t config_id,
     pcidi_t device_id)
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index e0b377f0c673..07890f848102 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
+ *	$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
+	"$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $";
 #endif
 
 /*
@@ -128,7 +128,7 @@ static struct vr_type vr_phys[] = {
 };
 
 static unsigned long vr_count = 0;
-static char *vr_probe		__P((pcici_t, pcidi_t));
+static const char *vr_probe	__P((pcici_t, pcidi_t));
 static void vr_attach		__P((pcici_t, int));
 
 static int vr_newbuf		__P((struct vr_softc *,
@@ -865,7 +865,7 @@ static void vr_reset(sc)
  * Probe for a VIA Rhine chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 vr_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index 4c667f223d0d..fd8b40b2ceef 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.5 1998/02/07 20:41:20 nate Exp $
+ * $Id: pcic_p.c,v 1.6 1998/08/18 00:32:48 bde Exp $
  */
 
 #include "pci.h"
@@ -44,7 +44,7 @@
 
 static u_long pcic_pci_count = 0;
 
-static char *pcic_pci_probe(pcici_t, pcidi_t);
+static const char *pcic_pci_probe(pcici_t, pcidi_t);
 static void  pcic_pci_attach(pcici_t, int);
 
 static void  pd6832_legacy_init(pcici_t tag, int unit);
@@ -63,7 +63,7 @@ DATA_SET(pcidevice_set, pcic_pci_driver);
  * Return the ID string for the controller if the vendor/product id
  * matches, NULL otherwise.
  */
-static char *
+static const char *
 pcic_pci_probe(pcici_t tag, pcidi_t type)
 {
 	switch (type) {
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 593b30579fe4..f05c164ff455 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
+ *	$Id: adv_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $
  */
 
 #include <pci.h>
@@ -76,7 +76,7 @@
 #define ADV_PCI_MAX_DMA_ADDR    (0xFFFFFFFFL)
 #define ADV_PCI_MAX_DMA_COUNT   (0xFFFFFFFFL)
 
-static char* advpciprobe(pcici_t tag, pcidi_t type);
+static const char* advpciprobe(pcici_t tag, pcidi_t type);
 static void advpciattach(pcici_t config_id, int unit);
 
 /* 
@@ -97,7 +97,7 @@ static struct  pci_device adv_pci_driver = {
 
 DATA_SET (pcidevice_set, adv_pci_driver);
 
-static  char*
+static const char*
 advpciprobe(pcici_t tag, pcidi_t type)
 {
 	int rev = pci_conf_read(tag, PCI_CLASS_REG) & 0xff;
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index eb941bf6a8e3..b65037bdba6b 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
+ *	$Id: adw_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $
  */
 
 #include <pci.h>
@@ -58,7 +58,7 @@
 #define ADW_PCI_MAX_DMA_ADDR    (0xFFFFFFFFUL)
 #define ADW_PCI_MAX_DMA_COUNT   (0xFFFFFFFFUL)
 
-static char* adwpciprobe(pcici_t tag, pcidi_t type);
+static const char* adwpciprobe(pcici_t tag, pcidi_t type);
 static void adwpciattach(pcici_t config_id, int unit);
 
 static struct  pci_device adw_pci_driver = {
@@ -71,7 +71,7 @@ static struct  pci_device adw_pci_driver = {
 
 DATA_SET (pcidevice_set, adw_pci_driver);
 
-static  char*
+static const char*
 adwpciprobe(pcici_t tag, pcidi_t type)
 {
 	switch (type) {
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index d4de62ef95cc..7ad19534854a 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
+/* $Id: brooktree848.c,v 1.60 1998/12/07 21:58:45 archie Exp $ */
 /* BT848 Driver for Brooktree's Bt848 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -438,7 +438,7 @@ static bktr_reg_t brooktree[ NBKTR ];
 #define MINOR(x)	((x >> 4) & 0x0f)
 #define ATTACH_ARGS	pcici_t tag, int unit
 
-static char*	bktr_probe( pcici_t tag, pcidi_t type );
+static const char*	bktr_probe( pcici_t tag, pcidi_t type );
 static void	bktr_attach( ATTACH_ARGS );
 
 static u_long	bktr_count;
@@ -1127,7 +1127,7 @@ static int	readEEProm( bktr_ptr_t bktr, int offset, int count,
 /*
  * the boot time probe routine.
  */
-static char*
+static const char*
 bktr_probe( pcici_t tag, pcidi_t type )
 {
 	switch (type) {
diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c
index 435aff09ee78..3c886d86a462 100644
--- a/sys/pci/bt_pci.c
+++ b/sys/pci/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.2 1998/10/30 02:06:42 gibbs Exp $
+ *	$Id: bt_pci.c,v 1.3 1998/11/10 06:45:14 gibbs Exp $
  */
 
 #include "pci.h"
@@ -53,7 +53,7 @@
 
 static int btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp,
 				  bus_space_handle_t* bshp);
-static char* bt_pci_probe(pcici_t tag, pcidi_t type);
+static const char* bt_pci_probe(pcici_t tag, pcidi_t type);
 static void bt_pci_attach(pcici_t config_id, int unit);
 
 static struct  pci_device bt_pci_driver = {
@@ -98,7 +98,7 @@ btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp,
 	return (0);
 }
 
-static  char*
+static const char*
 bt_pci_probe (pcici_t config_id, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index ae48965f69e6..a40630841411 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $
+ *	$Id: cy_pci.c,v 1.6 1997/09/02 20:06:24 bde Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
 
 #include <pci/cy_pcireg.h>
 
-static char *cy_probe		__P((pcici_t, pcidi_t));
+static const char *cy_probe		__P((pcici_t, pcidi_t));
 static void cy_attach		__P((pcici_t, int));
 
 extern int cyattach_common(void *, int); /* Not exactly correct */
@@ -61,7 +61,7 @@ static struct pci_device cy_device = {
 };
 DATA_SET(pcidevice_set, cy_device);
 
-static char *
+static const char *
 cy_probe(config_id, device_id)
 	pcici_t config_id;
 	pcidi_t device_id;
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index b704fca7ffba..7bf0e26e3138 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
+#ident "$Id: dpt_pci.c,v 1.10 1998/12/07 21:58:46 archie Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -64,7 +64,7 @@
 
 /* Function Prototypes */
 
-static char    *dpt_pci_probe(pcici_t tag, pcidi_t type);
+static const char    *dpt_pci_probe(pcici_t tag, pcidi_t type);
 static void     dpt_pci_attach(pcici_t config_id, int unit);
 
 extern struct cdevsw dpt_cdevsw;
@@ -86,7 +86,7 @@ DATA_SET(pcidevice_set, dpt_pci_driver);
  * because we do not know for sure how the two relate.
  */
 
-static char *
+static const char *
 dpt_pci_probe(pcici_t tag, pcidi_t type)
 {
 	u_int32_t  class;
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 37db78ed1511..acc6f6338308 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -80,7 +80,7 @@
  */
 
 static	void en_pci_attach __P((pcici_t, int));
-static	char *en_pci_probe __P((pcici_t, pcidi_t));
+static	const char *en_pci_probe __P((pcici_t, pcidi_t));
 #ifdef SHUTDOWN_PRE_SYNC
 static void en_pci_shutdown __P((int, void *));
 #else
@@ -203,7 +203,7 @@ void *v;
  * autoconfig stuff
  */
 
-static char *en_pci_probe(config_id, device_id)
+static const char *en_pci_probe(config_id, device_id)
 
 pcici_t config_id;
 pcidi_t device_id;
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 8706f2a06d5c..cff0be24ca84 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.6 1998/02/09 06:10:49 eivind Exp $
+ * $Id: if_fpa.c,v 1.7 1998/02/20 13:11:53 bde Exp $
  *
  */
 
@@ -135,7 +135,7 @@ static void pdq_pci_shutdown(int, void *);
  * on both EISA and PCI boards, one must be careful in how defines the
  * PDQ in the config file.
  */
-static char *
+static const char *
 pdq_pci_probe(
     pcici_t config_id,
     pcidi_t device_id)
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 3cffcab8030a..27f2048d4377 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.5 1997/08/02 14:33:11 bde Exp $
+ *	$Id: if_lnc_p.c,v 1.6 1998/07/20 17:33:01 msmith Exp $
  */
 
 #include "pci.h"
@@ -36,7 +36,7 @@
 
 extern void *lnc_attach_ne2100_pci __P((int unit, unsigned iobase));
 
-static char* lnc_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char* lnc_pci_probe __P((pcici_t tag, pcidi_t type));
 static void lnc_pci_attach __P((pcici_t config_id, int unit));
 
 static u_long lnc_pci_count = NLNC;
@@ -51,7 +51,7 @@ static struct pci_device lnc_pci_driver = {
 
 DATA_SET (pcidevice_set, lnc_pci_driver);
 
-static char*
+static const char*
 lnc_pci_probe (pcici_t tag, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 1970ade9073d..28102bbba54b 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mx.c,v 1.3 1998/12/05 02:21:43 wpaul Exp $
+ *	$Id: if_mx.c,v 1.4 1998/12/07 21:58:46 archie Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.3 1998/12/05 02:21:43 wpaul Exp $";
+	"$Id: if_mx.c,v 1.4 1998/12/07 21:58:46 archie Exp $";
 #endif
 
 /*
@@ -129,7 +129,7 @@ static struct mx_type mx_phys[] = {
 };
 
 static unsigned long mx_count = 0;
-static char *mx_probe		__P((pcici_t, pcidi_t));
+static const char *mx_probe	__P((pcici_t, pcidi_t));
 static void mx_attach		__P((pcici_t, int));
 
 static int mx_newbuf		__P((struct mx_softc *,
@@ -1225,7 +1225,7 @@ static void mx_reset(sc)
  * lets us tell the user exactly what type of device they have
  * in the probe output.
  */
-static char *
+static const char *
 mx_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 39d9786f31b4..f0b7577612df 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pn.c,v 1.2 1998/12/05 02:21:43 wpaul Exp $
+ *	$Id: if_pn.c,v 1.3 1998/12/07 21:58:46 archie Exp $
  */
 
 /*
@@ -95,7 +95,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.2 1998/12/05 02:21:43 wpaul Exp $";
+	"$Id: if_pn.c,v 1.3 1998/12/07 21:58:46 archie Exp $";
 #endif
 
 /*
@@ -124,7 +124,7 @@ static struct pn_type pn_phys[] = {
 };
 
 static unsigned long pn_count = 0;
-static char *pn_probe		__P((pcici_t, pcidi_t));
+static const char *pn_probe	__P((pcici_t, pcidi_t));
 static void pn_attach		__P((pcici_t, int));
 
 static int pn_newbuf		__P((struct pn_softc *,
@@ -743,7 +743,7 @@ static void pn_reset(sc)
  * Probe for a Lite-On PNIC chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 pn_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 7ceb5fdc6cc8..abd73a8dabcf 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rl.c,v 1.18 1998/12/10 17:52:36 wpaul Exp $
+ *	$Id: if_rl.c,v 1.6 1998/12/10 19:02:07 wpaul Exp $
  */
 
 /*
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.18 1998/12/10 17:52:36 wpaul Exp $";
+	"$Id: if_rl.c,v 1.6 1998/12/10 19:02:07 wpaul Exp $";
 #endif
 
 /*
@@ -160,7 +160,7 @@ static struct rl_type rl_phys[] = {
 };
 
 static unsigned long rl_count = 0;
-static char *rl_probe		__P((pcici_t, pcidi_t));
+static const char *rl_probe	__P((pcici_t, pcidi_t));
 static void rl_attach		__P((pcici_t, int));
 
 static int rl_encap		__P((struct rl_softc *, struct rl_chain *,
@@ -976,7 +976,7 @@ static void rl_reset(sc)
  * Probe for a RealTek 8129/8139 chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 rl_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 02a32e089f39..41a5ec3f2cbd 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.5 1997/09/02 20:06:27 bde Exp $
+ * $Id: if_sr_p.c,v 1.6 1998/02/09 06:10:52 eivind Exp $
  */
 
 #include "pci.h"
@@ -54,7 +54,7 @@ extern void *srattach_pci(int unit,
 			  vm_offset_t sca_vaddr);
 extern void srintr_hc(void *hc);
 
-static char *sr_pci_probe(pcici_t tag, pcidi_t type);
+static const char *sr_pci_probe(pcici_t tag, pcidi_t type);
 static void sr_pci_attach(pcici_t config_id, int unit);
 
 static u_long src_count = NSR;
@@ -69,7 +69,7 @@ static struct pci_device sr_pci_driver =
 
 DATA_SET (pcidevice_set, sr_pci_driver);
 
-static char *
+static const char *
 sr_pci_probe(pcici_t tag, pcidi_t type)
 {
 	switch(type) {
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index a68cc48b5694..61500c6953e9 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.21 1998/12/07 21:58:46 archie Exp $
+ *	$Id: if_tl.c,v 1.22 1998/12/10 19:02:07 wpaul Exp $
  */
 
 /*
@@ -218,7 +218,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.21 1998/12/07 21:58:46 archie Exp $";
+	"$Id: if_tl.c,v 1.22 1998/12/10 19:02:07 wpaul Exp $";
 #endif
 
 #ifdef TL_DEBUG
@@ -316,7 +316,7 @@ static struct tl_type tl_phys[] = {
 
 static unsigned long		tl_count;
 
-static char *tl_probe		__P((pcici_t, pcidi_t));
+static const char *tl_probe	__P((pcici_t, pcidi_t));
 static void tl_attach		__P((pcici_t, int));
 static int tl_attach_phy	__P((struct tl_softc *));
 static int tl_intvec_rxeoc	__P((void *, u_int32_t));
@@ -1365,7 +1365,7 @@ static void tl_softreset(sc, internal)
  * Probe for a ThunderLAN chip. Check the PCI vendor and device IDs
  * against our list and return its name if we find a match.
  */
-static char *
+static const char *
 tl_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 639a4256242e..a79ebebf602c 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.18 1998/12/07 21:58:46 archie Exp $ */
+/*	$Id: if_tx.c,v 1.19 1998/12/09 01:12:18 eivind Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -360,7 +360,7 @@ epic_shutdown(
 #else /* __FreeBSD__ */
 /* -----------------------------FreeBSD------------------------------------- */
 
-static char* epic_freebsd_probe __P((pcici_t, pcidi_t));
+static const char* epic_freebsd_probe __P((pcici_t, pcidi_t));
 static void epic_freebsd_attach __P((pcici_t, int));
 static void epic_shutdown __P((int, void *));
 
@@ -377,7 +377,7 @@ static struct pci_device txdevice = {
 DATA_SET ( pcidevice_set, txdevice );
 
 /* Synopsis: Check if device id corresponds with SMC83C170 id.  */
-static char*
+static const char*
 epic_freebsd_probe(
     pcici_t config_id,
     pcidi_t device_id)
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index e0b377f0c673..07890f848102 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
+ *	$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
+	"$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $";
 #endif
 
 /*
@@ -128,7 +128,7 @@ static struct vr_type vr_phys[] = {
 };
 
 static unsigned long vr_count = 0;
-static char *vr_probe		__P((pcici_t, pcidi_t));
+static const char *vr_probe	__P((pcici_t, pcidi_t));
 static void vr_attach		__P((pcici_t, int));
 
 static int vr_newbuf		__P((struct vr_softc *,
@@ -865,7 +865,7 @@ static void vr_reset(sc)
  * Probe for a VIA Rhine chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 vr_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index b65cfae8c8b6..1fa7b9afa18c 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wb.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
+ *	$Id: if_wb.c,v 1.3 1998/12/10 02:02:30 archie Exp $
  */
 
 /*
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
+	"$Id: if_wb.c,v 1.3 1998/12/10 02:02:30 archie Exp $";
 #endif
 
 /*
@@ -152,7 +152,7 @@ static struct wb_type wb_phys[] = {
 };
 
 static unsigned long wb_count = 0;
-static char *wb_probe		__P((pcici_t, pcidi_t));
+static const char *wb_probe	__P((pcici_t, pcidi_t));
 static void wb_attach		__P((pcici_t, int));
 
 static int wb_newbuf		__P((struct wb_softc *,
@@ -995,7 +995,7 @@ static void wb_reset(sc)
  * Probe for a Winbond chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 wb_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index ee233f7ce36b..9e77e0cb8cfa 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xl.c,v 1.62 1998/12/10 00:55:04 wpaul Exp $
+ *	$Id: if_xl.c,v 1.20 1998/12/10 16:18:42 wpaul Exp $
  */
 
 /*
@@ -147,7 +147,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.62 1998/12/10 00:55:04 wpaul Exp $";
+	"$Id: if_xl.c,v 1.20 1998/12/10 16:18:42 wpaul Exp $";
 #endif
 
 /*
@@ -194,7 +194,7 @@ static struct xl_type xl_phys[] = {
 };
 
 static unsigned long xl_count = 0;
-static char *xl_probe		__P((pcici_t, pcidi_t));
+static const char *xl_probe	__P((pcici_t, pcidi_t));
 static void xl_attach		__P((pcici_t, int));
 
 static int xl_newbuf		__P((struct xl_softc *,
@@ -1185,7 +1185,7 @@ static void xl_reset(sc)
  * Probe for a 3Com Etherlink XL chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
-static char *
+static const char *
 xl_probe(config_id, device_id)
 	pcici_t			config_id;
 	pcidi_t			device_id;
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 8619d496ef97..43dad60bb53f 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -129,7 +129,7 @@ static struct ispmdvec mdvec_2100 = {
 #define MEM_MAP_REG	0x14
 
 
-static char *isp_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char *isp_pci_probe __P((pcici_t tag, pcidi_t type));
 static void isp_pci_attach __P((pcici_t config_d, int unit));
 
 /* This distinguishing define is not right, but it does work */
@@ -196,7 +196,7 @@ struct pci_device isp_pci_driver = {
 DATA_SET (pcidevice_set, isp_pci_driver);
 
 
-static char *
+static const char *
 isp_pci_probe(tag, type)
 	pcici_t tag;
 	pcidi_t type;
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 96d6b21b7c6b..f81578d9496e 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -197,7 +197,7 @@ static meteor_reg_t meteor[NMETEOR];
 
 #define METPRI (PZERO+8)|PCATCH
 
-static	char*	met_probe (pcici_t tag, pcidi_t type);
+static	const char*	met_probe (pcici_t tag, pcidi_t type);
 static	void	met_attach(pcici_t tag, int unit);
 static	u_long	met_count;
 
@@ -517,7 +517,7 @@ register int		err = 0;
 }
 #undef i2c_print
 
-static	char *
+static	const char *
 met_probe (pcici_t tag, pcidi_t type)
 {
 	
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index 4c667f223d0d..fd8b40b2ceef 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.5 1998/02/07 20:41:20 nate Exp $
+ * $Id: pcic_p.c,v 1.6 1998/08/18 00:32:48 bde Exp $
  */
 
 #include "pci.h"
@@ -44,7 +44,7 @@
 
 static u_long pcic_pci_count = 0;
 
-static char *pcic_pci_probe(pcici_t, pcidi_t);
+static const char *pcic_pci_probe(pcici_t, pcidi_t);
 static void  pcic_pci_attach(pcici_t, int);
 
 static void  pd6832_legacy_init(pcici_t tag, int unit);
@@ -63,7 +63,7 @@ DATA_SET(pcidevice_set, pcic_pci_driver);
  * Return the ID string for the controller if the vendor/product id
  * matches, NULL otherwise.
  */
-static char *
+static const char *
 pcic_pci_probe(pcici_t tag, pcidi_t type)
 {
 	switch (type) {
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 0be0397f52e2..85642b814b3f 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simos.c,v 1.1 1998/06/10 10:57:14 dfr Exp $
+ *	$Id: simos.c,v 1.2 1998/09/26 14:49:26 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@ struct simos_softc* simosp[10];
 
 static u_long simos_unit;
 
-static char *simos_probe __P((pcici_t tag, pcidi_t type));
+static const char *simos_probe __P((pcici_t tag, pcidi_t type));
 static void simos_attach __P((pcici_t config_d, int unit));
 static void simos_action __P((struct cam_sim *sim, union ccb *ccb));
 static void simos_poll __P((struct cam_sim *sim));
@@ -84,7 +84,7 @@ struct pci_device simos_driver = {
 };
 DATA_SET (pcidevice_set, simos_driver);
 
-static char *
+static const char *
 simos_probe(pcici_t tag, pcidi_t type)
 {       
 	switch (type) {
diff --git a/sys/pci/wdc_p.c b/sys/pci/wdc_p.c
index 67d9de617112..f8ca641b72e2 100644
--- a/sys/pci/wdc_p.c
+++ b/sys/pci/wdc_p.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: wdc_p.c,v 1.2 1997/04/28 19:26:18 se Exp $
+ *	$Id: wdc_p.c,v 1.3 1997/08/02 14:33:14 bde Exp $
  */
 
 /*
@@ -41,7 +41,7 @@
 
 #define CMD640B_PCI_ID	0x06401095
 
-static char* wdc_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char* wdc_pci_probe __P((pcici_t tag, pcidi_t type));
 static void wdc_pci_attach __P((pcici_t config_id, int unit));
 
 static u_long wdc_pci_count = 0;
@@ -56,7 +56,7 @@ static struct pci_device wdc_pci_driver = {
 
 DATA_SET (pcidevice_set, wdc_pci_driver);
 
-static char*
+static const char*
 wdc_pci_probe (pcici_t tag, pcidi_t type)
 {
 	if (type == CMD640B_PCI_ID)
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 6603315604ec..1338c95ff785 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: xrpu.c,v 1.3 1998/10/24 19:47:42 phk Exp $
+ * $Id: xrpu.c,v 1.4 1998/11/08 12:39:06 dfr Exp $
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
@@ -29,7 +29,7 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-static	char*	xrpu_probe  (pcici_t tag, pcidi_t type);
+static	const char*	xrpu_probe  (pcici_t tag, pcidi_t type);
 static	void	xrpu_attach (pcici_t tag, int unit);
 static	u_long	xrpu_count;
 
@@ -225,7 +225,7 @@ static struct pci_device xrpu_device = {
 
 DATA_SET (pcidevice_set, xrpu_device);
 
-static char* 
+static const char* 
 xrpu_probe (pcici_t tag, pcidi_t typea)
 {
 	int data = pci_conf_read(tag, PCI_CLASS_REG);