pcidevs.h/pcidevs/pcidevs_data.h problems/patch

[kwesterback_(_at_)_home_(_dot_)_com]

In compiling a kernel on my i386 machine using a tree I updated
today (May 8), I encountered a number of problems with the files 
named in the subject. I applied the patches below and I was able 
to compile.

Since I don't have the Toshiba devices in question I don't
anticipate problems running with kernel I compiled up, but neither do I 
have the expertise to say if these are the correct patches ...

.... Ken

--- pcidevs.orig	Fri May  7 22:09:13 1999
+++ pcidevs	Sat May  8 21:53:47 1999
@@ -1203,7 +1203,7 @@
 /* Toshiba (2nd ID) products */
 product TOSHIBA2 THB 		0x0601	Host-PCI
 product TOSHIBA2 ToPIC95	0x0603	ToPIC95 CardBus-PCI
-product TOSHIBA2 ToPIC95	0x060a	ToPIC95B PCI-CardBus
+product TOSHIBA2 ToPIC95B	0x060a	ToPIC95B PCI-CardBus
 product TOSHIBA2 ToPIC97	0x060f	ToPIC97 PCI-CardBus
 product TOSHIBA2 TFIRO		0x0701	PCI-FIRO
 

--- pcidevs.h.orig	Fri May  7 22:09:14 1999
+++ pcidevs.h	Sat May  8 22:28:15 1999
@@ -1095,7 +1095,7 @@
 #define	PCI_PRODUCT_REALTEK_RT8129	0x8129		/* 8129 */
 #define	PCI_PRODUCT_REALTEK_RT8139	0x8139		/* 8139 */
 
-+/* RICOH products */
+/* RICOH products */
 #define	PCI_PRODUCT_RICOH_RF5C465	0x0465		/* 5C465 PCI-CardBus */
 #define	PCI_PRODUCT_RICOH_RF5C466	0x0466		/* 5C466 PCI-CardBus */
 #define	PCI_PRODUCT_RICOH_RF5C475	0x0475		/* 5C475 PCI-CardBus */
@@ -1208,7 +1208,7 @@
 /* Toshiba (2nd ID) products */
 #define	PCI_PRODUCT_TOSHIBA2_THB	0x0601		/* Host-PCI */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x0603		/* ToPIC95 CardBus-PCI */
-#define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x060a		/* ToPIC95B PCI-CardBus */
+#define	PCI_PRODUCT_TOSHIBA2_ToPIC95B	0x060a		/* ToPIC95B PCI-CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC97	0x060f		/* ToPIC97 PCI-CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_TFIRO	0x0701		/* PCI-FIRO */

--- pcidevs_data.h.orig	Fri May  7 22:09:15 1999
+++ pcidevs_data.h	Sat May  8 21:55:16 1999
@@ -2715,7 +2715,7 @@
 	    "ToPIC95 CardBus-PCI",
 	},
 	{
-	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95,
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95B,
 	    0,
 	    "Toshiba (2nd ID)",
 	    "ToPIC95B PCI-CardBus",