>Number:         8713
>Category:       kern
>Synopsis:       pccbb.c fails to compile
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 30 21:42:00 1999
>Last-Modified:
>Originator:     Takahiro Kambe
>Organization:
	
>Release:        NetBSD-current 1999/10/30
>Environment:
	
System: NetBSD land.sky.yamashina.kyoto.jp 1.4M NetBSD 1.4M (LAND) #120: Sun Oct 31 13:12:32 JST 1999 taca@land.sky.yamashina.kyoto.jp:/usr/src/sys/arch/i386/compile/LAND i386


>Description:
	pccbb.c fails to compile on NetBSD current of 1999/10/30.
>How-To-Repeat:
	add cardbus to a configuration file, and create the new kernel.
>Fix:
	Apply patch supplied bellow.  But it seems that there is
	inconsitency in naming of Ricoh chips between pcidevs and pccbbvar.h.
	So, there might be more better fix.

Index: pccbb.c
===================================================================
RCS file: /usr/local/libdata/cvs/netbsd/sys/dev/pci/pccbb.c,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 pccbb.c
--- pccbb.c	1999/10/27 23:05:26	1.1.2.3
+++ pccbb.c	1999/10/31 04:22:13
@@ -313,18 +313,18 @@
      PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
 
   /* Ricoh chips */
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C475), "RF5C475",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C475), "RF5C475",
      CB_RF5C47X, PCCBB_PCMCIA_MEM_32},
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C476), "RF5C476",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RL5C476), "RF5C476",
      CB_RF5C47X, PCCBB_PCMCIA_MEM_32},
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C477), "RF5C477",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C477), "RF5C477",
      CB_RF5C47X, PCCBB_PCMCIA_MEM_32},
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C478), "RF5C478",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C478), "RF5C478",
      CB_RF5C47X, PCCBB_PCMCIA_MEM_32},
 
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C465), "RF5C465",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C465), "RF5C465",
      CB_RF5C46X, PCCBB_PCMCIA_MEM_32},
-  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C466), "RF5C466",
+  {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C466), "RF5C466",
      CB_RF5C46X, PCCBB_PCMCIA_MEM_32},
 
   /* Toshiba products */

>Audit-Trail:
>Unformatted: