patch-2.3.37 linux/drivers/pci/pci.ids

• Lines: 100
• Date: Thu Jan 6 09:54:06 2000
• Orig file: v2.3.36/linux/drivers/pci/pci.ids
• Orig date: Wed Dec 29 13:13:16 1999

diff -u --recursive --new-file v2.3.36/linux/drivers/pci/pci.ids linux/drivers/pci/pci.ids
@@ -4,7 +4,7 @@
 #	Maintained by Martin Mares <[email protected]>
 #	If you have any new entries, send them to the maintainer.
 #
-#	$Id: pci.ids,v 1.43 1999/12/04 12:32:55 mj Exp $
+#	$Id: pci.ids,v 1.46 2000/01/02 20:32:11 mj Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -778,7 +778,8 @@
 	0002  PT80C524 [Nile]
 	0005  National PC87550 System Controller
 	8002  PT80C524 [Nile]
-1067  Mitsubishi Electronics
+1067  Mitsubishi Electric
+	1002  VG500 [VolumePro Volume Rendering Accelerator]
 1068  Diversified Technology
 1069  Mylex Corporation
 	0001  DAC960P
@@ -865,13 +866,14 @@
 	0010  VME Bridge Model 618
 	3000  VME Bridge Model 2706
 108c  Oakleigh Systems Inc.
-108d  Olicom
-	0001  OC-3136/3137
+108d Olicom
+	0001  Token-Ring 16/4 PCI Adapter (3136/3137)
 	0002  16/4 Token Ring
-	0004  OC-3139/3140 RapidFire Token-Ring 16/4
-	0005  OC-3250 GoCard Token-Ring 16/4
+	0004  RapidFire 3139 Token-Ring 16/4 PCI Adapter
+	0005  GoCard 3250 Token-Ring 16/4 CardBus PC Card
 	0006  OC-3530 RapidFire Token-Ring 100
-	0007  OC-3141 RapidFire Token-Ring 16/4
+	0007  RapidFire 3141 Token-Ring 16/4 PCI Fiber Adapter
+	0008  RapidFire 3540 HSTR 100/16/4 PCI Adapter
 	0011  OC-2315
 	0012  OC-2325
 	0013  OC-2183/2185
@@ -1012,17 +1014,23 @@
 	9080  9080
 		10b5 9080  9080 [real subsystem ID not set]
 10b6  Madge Networks
-	0001  Smart 16/4 Ringnode
-	0002  Smart 16/4 BM Mk2 Ringnode
-	0003  Smart 16/4 Ringnode
-		0e11 b0fd  NC4621 4/16 Token-Ring Adapter + WOL
-		10b6 0003  Smart 16/4 Ringnode Mk3
-		10b6 0007  Presto Mk2
-	0004  Smart 16/4 Ringnode (BM)
+	0001  Smart 16/4 PCI Ringnode
+	0002  Smart 16/4 PCI Ringnode Mk2
+		10b6 0002  Smart 16/4 PCI Ringnode Mk2
+		10b6 0006  16/4 CardBus Adapter
+	0003  Smart 16/4 PCI Ringnode Mk3
+		0e11 b0fd  Compaq NC4621 PCI, 4/16, WOL
+		10b6 0003  Smart 16/4 PCI Ringnode Mk3
+		10b6 0007  Presto PCI Plus Adapter
+	0004  Smart 16/4 PCI Ringnode Mk1
 	0006  16/4 Cardbus Adapter
-	0007  Presto
-	1000  Collage 25 ATM adaptor
-	1001  Collage 155 Server
+		10b6 0006  16/4 CardBus Adapter
+	0007  Presto PCI Adapter
+	0009  Smart 100/16/4 PCI-HS Ringnode
+	000a  Smart 100/16/4 PCI Ringnode
+	000b  16/4 CardBus Adapter Mk2
+	1000  Collage 25 ATM Adapter
+	1001  Collage 155 ATM Server Adapter
 10b7  3Com Corporation
 	0001  3c985 1000BaseSX
 	3390  Token Link Velocity
@@ -2108,6 +2116,8 @@
 	8888  Cinemaster C 3.0 DVD Decoder
 1240  Marathon Technologies Corp.
 1241  DSC Communications
+1242  Jaycor Networks, Inc.
+	4643  FCI-1063 Fibre Channel Adapter
 1243  Delphax
 1244  AVM Audiovisuelles MKTG & Computer System GmbH
 	0700  B1 ISDN
@@ -2295,7 +2305,8 @@
 12c4  Connect Tech Inc
 12c5  Picture Elements Incorporated
 	0081  PCIVST [Grayscale Thresholding Engine]
-	0086  THR2 Thresholder
+	0085  Video Simulator/Sender
+	0086  THR2 Multi-scale Thresholder
 12c6  Mitani Corporation
 12c7  Dialogic Corp
 12c8  G Force Co, Ltd
@@ -3271,6 +3282,7 @@
 		0e11 b123  NC1634 Gigabit Ethernet Adapter
 		1014 0119  Netfinity Gigabit Ethernet SX Adapter
 		8086 1000  EtherExpress PRO/1000 Gigabit Server Adapter
+	1030  82559 InBusiness 10/100
 	1209  82559ER
 	1221  82092AA_0
 	1222  82092AA_1