summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lst/Cards+40
-rw-r--r--lst/pcitable14
2 files changed, 11 insertions, 43 deletions
diff --git a/lst/Cards+ b/lst/Cards+
index 6a13dbd7..9380f85e 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -491,46 +491,14 @@ NAME Intel 830 - 965
DRIVER i810
DRI_GLX
-# Alan Cox's new "voodoo" driver for Voodoo Graphics and Voodoo II
-#0x121a 0x0001 "Card:Voodoo Graphics" "3Dfx Interactive, Inc.|Voodoo"
-NAME Voodoo Graphics
-CHIPSET Voodoo Graphics
-DRIVER voodoo
+# 3DFX
-# Alan Cox's new "voodoo" driver for Voodoo Graphics and Voodoo II
-#0x121a 0x0002 "Card:Voodoo II" "3Dfx Interactive, Inc.|Voodoo 2"
-NAME Voodoo II
-CHIPSET Voodoo II
+NAME 3DFX Voodoo / Voodoo II
DRIVER voodoo
-NAME Voodoo Banshee (generic)
-DRIVER tdfx
-# DRI_GLX 16bit only
-
-NAME Voodoo Rush (generic)
-DRIVER tdfx
-LINE Option "nodri"
-
-NAME Voodoo3 (generic)
-DRIVER tdfx
-
-NAME Voodoo4 (generic)
+NAME 3DFX Voodoo 3 - 5 / Banshee / Rush
DRIVER tdfx
-
-NAME Voodoo5 (generic)
-DRIVER tdfx
-
-NAME Elsa Victory II
-SEE Voodoo Banshee (generic)
-
-NAME Diamond Monster Fusion
-SEE Voodoo Banshee (generic)
-
-NAME AOpen PA2010
-SEE Voodoo Banshee (generic)
-
-NAME Chaintech Desperado 3F10
-SEE Voodoo Banshee (generic)
+DRI_GLX
# Silicon Motion, Inc.
diff --git a/lst/pcitable b/lst/pcitable
index 77ffa6b8..f59fbef8 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -4913,13 +4913,13 @@
0x1217 0x7213 "yenta_socket" "O2Micro Inc.|OZ6933E CardBus Controller"
0x1217 0x7223 "yenta_socket" "O2Micro Inc.|OZ711M3 SmartCardBus MultiMediaBay Controller"
0x1217 0x7233 "yenta_socket" "O2Micro Inc.|OZ711MP3/MS3 4-in-1 MemoryCardBus Controller"
-0x121a 0x0001 "Card:Voodoo Graphics" "3Dfx Interactive Inc.|Voodoo"
-0x121a 0x0002 "Card:Voodoo II" "3Dfx Interactive Inc.|Voodoo 2"
-0x121a 0x0003 "Card:Voodoo Banshee (generic)" "3Dfx Interactive Inc.|Voodoo Banshee"
-0x121a 0x0004 "Card:Voodoo Banshee (generic)" "3Dfx Interactive Inc.|Voodoo Banshee [Velocity 100]"
-0x121a 0x0005 "Card:Voodoo3 (generic)" "3Dfx Interactive Inc.|Voodoo 3"
-0x121a 0x0007 "Card:Voodoo4 (generic)" "3dfx Interactive Inc.|Voodoo4"
-0x121a 0x0009 "Card:Voodoo5 (generic)" "3Dfx Interactive Inc.|Voodoo 4 / Voodoo 5"
+0x121a 0x0001 "Card:3DFX Voodoo / Voodoo II" "3Dfx Interactive Inc.|Voodoo"
+0x121a 0x0002 "Card:3DFX Voodoo / Voodoo II" "3Dfx Interactive Inc.|Voodoo 2"
+0x121a 0x0003 "Card:3DFX Voodoo 3 - 5 / Banshee / Rush" "3Dfx Interactive Inc.|Voodoo Banshee"
+0x121a 0x0004 "Card:3DFX Voodoo 3 - 5 / Banshee / Rush" "3Dfx Interactive Inc.|Voodoo Banshee [Velocity 100]"
+0x121a 0x0005 "Card:3DFX Voodoo 3 - 5 / Banshee / Rush" "3Dfx Interactive Inc.|Voodoo 3"
+0x121a 0x0007 "Card:3DFX Voodoo 3 - 5 / Banshee / Rush" "3dfx Interactive Inc.|Voodoo4"
+0x121a 0x0009 "Card:3DFX Voodoo 3 - 5 / Banshee / Rush" "3Dfx Interactive Inc.|Voodoo 4 / Voodoo 5"
0x121a 0x0010 "unknown" "3dfx Interactive Inc.|Rampage Rev.A AGPx4, 0.25µm, 200/2x200 core/RAM"
0x121a 0x0057 "unknown" "3Dfx Interactive Inc.|Voodoo 3/3000 [Avenger]"
0x121e 0x0201 "unknown" "CSPI|Myrinet 2000 Scalable Cluster Interconnect"