diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index a914cab7899a..5a257c2fe75c 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.128 2001/05/20 09:15:54 ichiro Exp $
+$NetBSD: pcmciadevs,v 1.129 2001/05/20 09:54:47 ichiro Exp $
 /*$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.8 2001/01/20 01:48:55 imp Exp $*/
 
 /*-
@@ -190,7 +190,7 @@ product MEGAHERTZ XJEM3336 	0x0006 Megahertz X-JACK Ethernet Modem
 product MELCO LPC3_TX	 	0xc1ab Melco LPC3-TX
 
 /* National Instruments */
-product NI PCMCIA-GPIB	 	0x4882 National Instruments PCMCIA-GPIB
+product NI PCMCIA_GPIB	 	0x4882 National Instruments PCMCIA-GPIB
 
 /* Nokia Products */
 product NOKIA C020_WLAN		0x20c0 Nokia C020 WLAN Card
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index cf9b28c5a0d6..7c324c486a6a 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs.h,v 1.127 2001/05/20 09:16:14 ichiro Exp $	*/
+/*	$NetBSD: pcmciadevs.h,v 1.128 2001/05/20 09:54:48 ichiro Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.127 2001/05/18 06:05:52 jhawk Exp 
+ *	NetBSD: pcmciadevs,v 1.128 2001/05/20 09:15:54 ichiro Exp 
  */
 /*$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.8 2001/01/20 01:48:55 imp Exp $*/
 
@@ -301,9 +301,9 @@
 #define	PCMCIA_STR_MELCO_LPC3_TX	"Melco LPC3-TX"
 
 /* National Instruments */
-#define	PCMCIA_CIS_NI_PCMCIA-GPIB	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_NI_PCMCIA-GPIB	0x4882
-#define	PCMCIA_STR_NI_PCMCIA-GPIB	"National Instruments PCMCIA-GPIB"
+#define	PCMCIA_CIS_NI_PCMCIA_GPIB	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NI_PCMCIA_GPIB	0x4882
+#define	PCMCIA_STR_NI_PCMCIA_GPIB	"National Instruments PCMCIA-GPIB"
 
 /* Nokia Products */
 #define	PCMCIA_CIS_NOKIA_C020_WLAN	{ NULL, NULL, NULL, NULL }
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index ca4f09ade74e..1507ece65ed5 100644
--- a/sys/dev/pcmcia/pcmciadevs_data.h
+++ b/sys/dev/pcmcia/pcmciadevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs_data.h,v 1.127 2001/05/20 09:16:15 ichiro Exp $	*/
+/*	$NetBSD: pcmciadevs_data.h,v 1.128 2001/05/20 09:54:48 ichiro Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.127 2001/05/18 06:05:52 jhawk Exp 
+ *	NetBSD: pcmciadevs,v 1.128 2001/05/20 09:15:54 ichiro Exp 
  */
 /*$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.8 2001/01/20 01:48:55 imp Exp $*/
 
@@ -410,8 +410,8 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    "Melco LPC3-TX"	},
 	},
 	{
-	    PCMCIA_VENDOR_NI, PCMCIA_PRODUCT_NI_PCMCIA-GPIB,
-	    PCMCIA_CIS_NI_PCMCIA-GPIB,
+	    PCMCIA_VENDOR_NI, PCMCIA_PRODUCT_NI_PCMCIA_GPIB,
+	    PCMCIA_CIS_NI_PCMCIA_GPIB,
 	    0,
 	    "National Instruments",
 	    "National Instruments PCMCIA-GPIB"	},