From 920548477c5cb6e093f3518182cdf2172a817953 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 25 Apr 2007 04:08:21 +0000 Subject: - rationalize permedia / glint entries --- lst/pcitable | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lst/pcitable') diff --git a/lst/pcitable b/lst/pcitable index 2c632685..2c128060 100644 --- a/lst/pcitable +++ b/lst/pcitable @@ -1757,7 +1757,7 @@ 0x1045 0xd568 "opti621" "OPTi Inc.|82C825 [Firebridge 2]" 0x1045 0xd721 "unknown" "OPTi Inc.|IDE [FireStar]" 0x1045 0xd768 "unknown" "OPTi Inc.|82C750 Ultra DMA IDE controller" -0x1048 0x0a32 "Card:Elsa GLoria Synergy" "Elsa|Gloria Synergy" +0x1048 0x0a32 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "Elsa|Gloria Synergy" 0x1048 0x0c60 "Card:NVIDIA RIVA TNT - GeForce 2 (71xx)" "Elsa|Gladiac MX" 0x1048 0x0d22 "Card:NVIDIA GeForce 3 - GeForce 4 (96xx)" "Elsa|Quadro4 900XGL [ELSA GLoria4 900XGL]" 0x1048 0x1000 "ISDN:hisax,type=18" "Elsa|QuickStep 1000 ISDN Adapter" @@ -1789,8 +1789,8 @@ 0x104c 0x0508 "unknown" "Texas Instruments|TMS380C2X Compressor Interface" 0x104c 0x1000 "unknown" "Texas Instruments|Eagle i/f AS" 0x104c 0x104c "yenta_socket" "Texas Instruments|PCI1510 PC card Cardbus Controller" -0x104c 0x3d04 "Card:3Dlabs Permedia2 (generic)" "Texas Instruments|TVP4010 [Permedia]" -0x104c 0x3d07 "Card:Elsa GLoria Synergy" "Texas Instruments|ELSA GLoria Synergy [Permedia 2]" +0x104c 0x3d04 "Card:3Dlabs Glint / Permedia-based cards" "Texas Instruments|TVP4010 [Permedia]" +0x104c 0x3d07 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "Texas Instruments|ELSA GLoria Synergy [Permedia 2]" 0x104c 0x8000 "pcilynx" "Texas Instruments|PCILynx/PCILynx2 IEEE 1394 Link Layer Controller" 0x104c 0x8009 "ohci1394" "Texas Instruments|OHCI Compliant FireWire Controller" 0x104c 0x8011 "yenta_socket" "Texas Instruments|PCI4450 OHCI-Lynx IEEE 1394 Controller" @@ -6582,32 +6582,32 @@ 0x3842 0xc370 "unknown" "eVga.com. Corp.|e-GeFORCE 6600 256 DDR PCI-e" 0x38d0 0x62d6 "unknown" "MFP GmbH|fieldbus-master PCI Measurement bus controller for EPSI" 0x3990 0x0007 "bttv" "Hauppauge|WinTV-D" -0x3d3d 0x0001 "Card:Elsa GLoria-S" "3DLabs|GLINT 300SX" -0x3d3d 0x0002 "Card:Elsa GLoria-L" "3DLabs|GLINT 500TX" -0x3d3d 0x0003 "Card:Elsa GLoria-S" "3DLabs|GLINT Delta" -0x3d3d 0x0004 "Card:Elsa GLoria-S" "3DLabs|GLINT Permedia" -0x3d3d 0x0005 "Card:Elsa GLoria-S" "3DLabs|Permedia" -0x3d3d 0x0006 "Card:Elsa GLoria-S" "3DLabs|GLINT MX" -0x3d3d 0x0007 "Card:Elsa GLoria-S" "3DLabs|4D Extreme [GLINT Permedia 2]" -0x3d3d 0x0008 "Card:Elsa GLoria-S" "3DLabs|GLINT Gamma" -0x3d3d 0x0009 "Card:3Dlabs Permedia2 (generic)" "3DLabs|Permedia II 2D+3D" -0x3d3d 0x000a "Card:Elsa GLoria-S" "3DLabs|GLINT R3" -0x3d3d 0x000c "Card:3Dlabs Permedia4 (generic)" "3DLabs|GLINT Permedia 4" -0x3d3d 0x000d "Card:3Dlabs Permedia4 (generic)" "3DLabs|GLINT R4" -0x3d3d 0x000e "Card:3Dlabs Permedia4 (generic)" "3DLabs|GLINT Gamma 2" -0x3d3d 0x0011 "Card:3Dlabs Permedia4 (generic)" "3DLabs|GLINT R4 (Alt)" +0x3d3d 0x0001 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT 300SX" +0x3d3d 0x0002 "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|GLINT 500TX" +0x3d3d 0x0003 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT Delta" +0x3d3d 0x0004 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT Permedia" +0x3d3d 0x0005 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|Permedia" +0x3d3d 0x0006 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT MX" +0x3d3d 0x0007 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|4D Extreme [GLINT Permedia 2]" +0x3d3d 0x0008 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT Gamma" +0x3d3d 0x0009 "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|Permedia II 2D+3D" +0x3d3d 0x000a "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|GLINT R3" +0x3d3d 0x000c "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|GLINT Permedia 4" +0x3d3d 0x000d "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|GLINT R4" +0x3d3d 0x000e "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|GLINT Gamma 2" +0x3d3d 0x0011 "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|GLINT R4 (Alt)" 0x3d3d 0x0012 "unknown" "3DLabs|GLint R5 rev A" 0x3d3d 0x0013 "unknown" "3DLabs|GLint R5 rev B" 0x3d3d 0x0020 "unknown" "3DLabs|VP10 visual processor" 0x3d3d 0x0022 "unknown" "3DLabs|VP10 visual processor" 0x3d3d 0x0024 "unknown" "3DLabs|VP9 visual processor" -0x3d3d 0x0100 "Card:3Dlabs Permedia2 (generic)" "3DLabs|Permedia II 2D+3D" +0x3d3d 0x0100 "Card:3Dlabs Glint / Permedia-based cards" "3DLabs|Permedia II 2D+3D" 0x3d3d 0x07a1 "unknown" "3DLabs|Wildcat III 6210" 0x3d3d 0x07a2 "unknown" "3DLabs|Sun XVR-500 Graphics Accelerator" 0x3d3d 0x07a3 "unknown" "3DLabs|Wildcat IV 7210" -0x3d3d 0x1004 "Card:Elsa GLoria-S" "3DLabs|Permedia" -0x3d3d 0x3d04 "Card:Elsa GLoria-S" "3DLabs|Permedia" -0x3d3d 0xffff "Card:Elsa GLoria-S" "3DLabs|Glint VGA" +0x3d3d 0x1004 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|Permedia" +0x3d3d 0x3d04 "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|Permedia" +0x3d3d 0xffff "Card:3Dlabs Glint / Permedia-based cards (software cursor)" "3DLabs|Glint VGA" 0x4005 0x0300 "snd-als300" "Avance Logic Inc.|ALS300 PCI Audio Device" 0x4005 0x0308 "snd-als300" "Avance Logic Inc.|ALS300+ PCI Audio Device" 0x4005 0x0309 "unknown" "Avance Logic Inc.|PCI Input Controller" -- cgit v1.2.1