patch-1.3.15 linux/drivers/pci/pci.c

• Lines: 40
• Date: Wed Aug 2 09:41:45 1995
• Orig file: v1.3.14/linux/drivers/pci/pci.c
• Orig date: Tue Jul 11 10:02:50 1995

diff -u --recursive --new-file v1.3.14/linux/drivers/pci/pci.c linux/drivers/pci/pci.c
@@ -135,7 +135,8 @@
 	DEVICE( QLOGIC,		QLOGIC_ISP1020,	"ISP1020"),
 	DEVICE( QLOGIC,		QLOGIC_ISP1022,	"ISP1022"),
 	DEVICE( X,		X_AGX016,	"ITT AGX016"),
-	DEVICE( VORTEX,		VORTEX_GDT,	"GDT 6000b")
+	DEVICE( VORTEX,		VORTEX_GDT,	"GDT 6000b"),
+	DEVICE( HP,		HP_J2585A,	"J2585A")
 };
 
 
@@ -157,9 +158,9 @@
  * optimizations...
  */
 struct optimization_type {
-	char	*type;
-	char	*off;
-	char	*on;
+	const char	*type;
+	const char	*off;
+	const char	*on;
 } bridge_optimization[] = {
 	{"Cache L2",			"write trough",	"write back"},
 	{"CPU-PCI posted write",	"off",		"on"},
@@ -233,7 +234,7 @@
 }
 
 
-char *pci_strbioserr (int error)
+const char *pci_strbioserr (int error)
 {
 	switch (error) {
 	      case PCIBIOS_SUCCESSFUL:		return "SUCCESSFUL";
@@ -337,6 +338,7 @@
 	      case PCI_VENDOR_ID_X:		return "X TECHNOLOGY";
 	      case PCI_VENDOR_ID_ACC:		return "ACC MICROELECTRONICS";
 	      case PCI_VENDOR_ID_VORTEX:	return "VORTEX";
+	      case PCI_VENDOR_ID_HP:		return "Hewlett Packard";
 	      default:				return "Unknown vendor";
 	}
 }