diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index ff26f2143a02..1707323b8cd5 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9xvar.h,v 1.43 2003/11/02 11:07:45 wiz Exp $	*/
+/*	$NetBSD: ncr53c9xvar.h,v 1.44 2004/08/10 19:12:25 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -277,7 +277,7 @@ struct ncr53c9x_softc {
 	struct device *sc_child;		/* attached scsibus, if any */
 	struct callout sc_watchdog;		/* periodic timer */
 
-	struct ncr53c9x_glue *sc_glue;		/* glue to MD code */
+	const struct ncr53c9x_glue *sc_glue;	/* glue to MD code */
 
 	int	sc_cfflags;			/* Copy of config flags */
 
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 4fd9581a483d..4d7ba33f8b26 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_pcmcia.c,v 1.22 2004/08/10 18:43:49 mycroft Exp $	*/
+/*	$NetBSD: esp_pcmcia.c,v 1.23 2004/08/10 19:12:25 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.22 2004/08/10 18:43:49 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.23 2004/08/10 19:12:25 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,7 +111,7 @@ void	esp_pcmcia_dma_go __P((struct ncr53c9x_softc *));
 void	esp_pcmcia_dma_stop __P((struct ncr53c9x_softc *));
 int	esp_pcmcia_dma_isactive __P((struct ncr53c9x_softc *));
 
-struct ncr53c9x_glue esp_pcmcia_glue = {
+const struct ncr53c9x_glue esp_pcmcia_glue = {
 	esp_pcmcia_read_reg,
 	esp_pcmcia_write_reg,
 	esp_pcmcia_dma_isintr,
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index 1146cd402969..0c6d5a40e759 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.23 2004/08/10 18:43:49 mycroft Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.24 2004/08/10 19:12:25 mycroft Exp $ */
 
 /*-
  * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.23 2004/08/10 18:43:49 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.24 2004/08/10 19:12:25 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,7 @@ struct an_pcmcia_softc {
 CFATTACH_DECL(an_pcmcia, sizeof(struct an_pcmcia_softc),
     an_pcmcia_match, an_pcmcia_attach, an_pcmcia_detach, an_activate);
 
-static struct pcmcia_product an_pcmcia_products[] = {
+static const struct pcmcia_product an_pcmcia_products[] = {
 	{ PCMCIA_VENDOR_AIRONET,	PCMCIA_PRODUCT_AIRONET_PC4800,
 	  PCMCIA_CIS_AIRONET_PC4800 },
 	{ PCMCIA_VENDOR_AIRONET,	PCMCIA_PRODUCT_AIRONET_PC4500,