rh 7.3 beta merge, step 2 (66% done)

1 files changed, 25 insertions, 9 deletions

diff --git a/lst/pcitable b/lst/pcitable
index 2922c63f..8f979c8e 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -1403,9 +1403,13 @@
 0x10b9	0x5244	"unknown"	"Acer Labs Incorporated (ALI)|Floppy Disk Controller"
 0x10b9	0x5247	"unknown"	"Acer Laboratories Inc. [ALi]|M5247"
 0x10b9	0x5251	"unknown"	"Acer Laboratories Inc. [ALi]|M5251 P1394 OHCI 1.0 Controller"
-0x10b9	0x5253	"unknown"	"Acer Laboratories Inc. [ALi]|5253 P1394 OHCI 1.1 Controller"
+0x10b9	0x5253	"unknown"	"Acer Laboratories Inc. [ALi]|M5253 P1394 OHCI 1.1 Controller"
+0x10b9	0x5255	"unknown"	"Acer Laboratories Inc. [ALi]|M5455 PCI AC-Link Controller Audio Device"
 0x10b9	0x5261	"unknown"	"Acer Laboratories Inc. [ALi]|M5261 Ethernet Controller"
+0x10b9	0x5271	"unknown"	"Acer Laboratories Inc. [ALi]|M5471 Memory Stick Controller"
+0x10b9	0x5273	"unknown"	"Acer Laboratories Inc. [ALi]|M5473 SD-MMC Controller"
 0x10b9	0x5451	"trident"	"Acer Laboratories Inc. [ALi]|M5451 PCI South Bridge Audio"
+0x10b9	0x5453	"trident"	"Acer Laboratories Inc. [ALi]|M5453 PCI AC-Link Controller Modem Device"
 0x10b9	0x7101	"unknown"	"Acer Laboratories Inc. [ALi]|M7101 PMU"
 0x10ba	0x0301	"unknown"	"Mitsubishi Electric Corp.|AccelGraphics AccelECLIPSE"
 0x10ba	0x0304	"unknown"	"Mitsubishi Electronics Corp.|GUI Accelerator"
@@ -1493,10 +1497,11 @@
 0x10de	0x0171	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0171"
 0x10de	0x0172	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0172"
 0x10de	0x0173	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0173"
-0x10de	0x0174	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0174"
-0x10de	0x0175	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0175"
-0x10de	0x0176	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0176"
-0x10de	0x0178	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x0178"
+0x10de	0x0174	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|NV17 [GeForce4 440 Go]"
+0x10de	0x0175	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|NV17 [GeForce4 420 Go]"
+0x10de	0x0176	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|NV17 [GeForce4 420 Go 32M]"
+0x10de	0x0178	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|NV1x"
+0x10de	0x0179	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|NV17 [GeForce4 440 Go 64M]"
 0x10de	0x017a	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x017A"
 0x10de	0x017b	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x017B"
 0x10de	0x017c	"Card:NVIDIA GeForce2 DDR (generic)"	"NVidia|0x017C"
@@ -1511,7 +1516,7 @@
 0x10de	0x01ac	"unknown"	"Nvidia Corporation|nForce 220/420 Memory Controller"
 0x10de	0x01ad	"unknown"	"Nvidia Corporation|nForce 220/420 Memory Controller"
 0x10de	0x01b0	"unknown"	"Nvidia Corporation|nForce MCP Audio Processing Unit (Dolby Digital)"
-0x10de	0x01b1	"unknown"	"Nvidia Corporation|nForce Audio Codec Interface"
+0x10de	0x01b1	"i810_audio"	"Nvidia Corporation|nForce Audio Codec Interface"
 0x10de	0x01b2	"unknown"	"Nvidia Corporation|nForce Joystick"
 0x10de	0x01b4	"unknown"	"Nvidia Corporation|nForce SMBus Controller"
 0x10de	0x01b7	"unknown"	"Nvidia Corporation|nForce AGP Host to PCI Bridge"
@@ -1524,7 +1529,10 @@
 0x10de	0x0202	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3 (rev 2)"
 0x10de	0x0203	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3 (rev 3)"
 0x10de	0x0250	"Card:NVIDIA GeForce3 (generic)"	"NVidia|0x0250"
-0x10de	0x0258	"Card:NVIDIA GeForce3 (generic)"	"NVidia|0x0258"
+0x10de	0x0251	"Card:NVIDIA GeForce3 (generic)"	"NVidia|NV25 [GeForce4 Ti4400]"
+0x10de	0x0253	"Card:NVIDIA GeForce3 (generic)"	"NVidia|NV25 [GeForce4 Ti4200]"
+0x10de	0x0258	"Card:NVIDIA GeForce3 (generic)"	"NVidia|NV25 (GeForce 4)"
+0x10de	0x025b	"Card:NVIDIA GeForce3 (generic)"	"NVidia|NV25 (GeForce 4)"
 0x10de	0x02a0	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3 Integrated (Xbox)"
 0x10df	0x10df	"unknown"	"Emulex Corporation|Light Pulse Fibre Channel Adapter"
 0x10df	0x1ae5	"unknown"	"Emulex Corporation|LP6000 Fibre Channel Host Adapter"
@@ -1564,6 +1572,7 @@
 0x10e8	0x80da	"unknown"	"Applied Micro|PCI-9812"
 0x10e8	0x811a	"unknown"	"Applied Micro|PCI-IEEE1355-DS-DE Interface"
 0x10e8	0x8170	"unknown"	"Applied Micro|S5933 "Matchmaker" PCI Chipset Development Tool"
+0x10e8	0x81db	"unknown"	"Applied Micro|AJA HDNTV HD SDI Framestore"
 0x10ea	0x1680	"Server:SVGA"	"Intergraphics Systems|IGA-1680"
 0x10ea	0x1682	"Server:SVGA"	"Intergraphics Systems|IGA-1682"
 0x10ea	0x1683	"unknown"	"Intergraphics Systems|IGA-1683"
@@ -1615,6 +1624,7 @@
 0x10fa	0x0013	"unknown"	"TrueVision|GUI Accelerator"
 0x10fa	0x0014	"unknown"	"TrueVision|GUI Accelerator"
 0x10fa	0x0015	"unknown"	"TrueVision|GUI Accelerator"
+0x10fc	0x0003	"unknown"	"I-O Data Device, Inc.|Cardbus IDE Controller"
 0x1101	0x0002	"initio"	"Initio Corporation|Ultra SCSI Adapter"
 0x1101	0x1060	"initio"	"Initio Corporation|INI-A100U2W"
 0x1101	0x134a	"initio"	"Initio Corporation|Ultra SCSI Adapter"
@@ -1684,6 +1694,7 @@
 0x1106	0x3101	"unknown"	"VIA Technologies Inc|VT8653 CPU to PCI Bridge"
 0x1106	0x3102	"unknown"	"VIA Technologies Inc|VT8662 CPU to PCI Bridge"
 0x1106	0x3103	"unknown"	"VIA Technologies Inc|VT8615 CPU to PCI Bridge"
+0x1106	0x3104	"unknown"	"VIA Technologies Inc|USB 2.0"
 0x1106	0x3109	"unknown"	"VIA Technologies|VT8233C PCI to ISA Bridge"
 0x1106	0x3112	"unknown"	"VIA Technologies Inc|VT8361 CPU to PCI Bridge"
 0x1106	0x3113	"unknown"	"VIA Technologies Inc|PCI to PCI Bridge"
@@ -1752,6 +1763,7 @@
 0x110a	0x4942	"unknown"	"Siemens Nixdorf AG|FPGA I-Bus Tracer for MBD"
 0x110a	0x6120	"unknown"	"Siemens Nixdorf AG|SZB6120"
 0x110b	0x0001	"unknown"	"Chromatic Research Inc.|Mpact Media Processor"
+0x110b	0x0004	"unknown"	"Chromatic Research Inc.|Mpact 2"
 0x1110	0x6037	"unknown"	"Powerhouse Systems|Firepower Powerized SMP I/O ASIC"
 0x1110	0x6073	"unknown"	"Powerhouse Systems|Firepower Powerized SMP I/O ASIC"
 0x1112	0x2200	"unknown"	"RNS - Div. of Meret Communications Inc|FDDI Adapter"
@@ -2196,6 +2208,7 @@
 0x11fe	0x000a	"unknown"	"Comtrol Corporation|RocketPort Plus Quadcable"
 0x11fe	0x000b	"unknown"	"Comtrol Corporation|RocketPort Plus Octacable"
 0x11fe	0x000c	"unknown"	"Comtrol Corporation|RocketPort 8-port Modem"
+0x11fe	0x8015	"unknown"	"Comtrol Corporation|RocketPort 4-port UART 16954"
 0x1200	0xbd11	"bttv"	"Pinnacle|PCTV Rave"
 0x1208	0x4853	"unknown"	"Parsytec GmbH|HS-Link Device"
 0x120e	0x0100	"unknown"	"Cyclades Corporation|Cyclom_Y below first megabyte"
@@ -2224,10 +2237,11 @@
 0x121a	0x0001	"unknown"	"3Dfx Interactive, Inc.|Voodoo"
 0x121a	0x0002	"unknown"	"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"
+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	"unknown"	"3dfx Interactive Inc|Voodoo4"
-0x121a	0x0009	"Card:Voodoo5 (generic)"	"3Dfx Interactive, Inc.|Voodoo 5"
+0x121a	0x0009	"Card:Voodoo5 (generic)"	"3Dfx Interactive, Inc.|Voodoo 4 / Voodoo 5"
+0x121a	0x0057	"unknown"	"3Dfx Interactive, Inc.|Voodoo 3/3000 [Avenger]"
 0x1220	0x1220	"unknown"	"Ariel Corporation|AMCC 5933 TMS320C80 DSP/Imaging board"
 0x1223	0x0003	"unknown"	"Artesyn Communication Products|PM/Link"
 0x1223	0x0004	"unknown"	"Artesyn Communication Products|PM/T1"
@@ -2260,6 +2274,7 @@
 0x1244	0x0e00	"hisax_fcpcipnp"	"AVM Audiovisuelles|A1 ISDN Adapter [Fritz]"
 0x1244	0x1100	"unknown"	"AVM AUDIOVISUELLES MKTG & Computer GmbH|C2 ISDN Controller"
 0x1244	0x1200	"t1pci"	"AVM Audiovisuelles|T1 pci adapter"
+0x124b	0x0040	"unknown"	"SBS/Greenspring Modular I/O|cPCI-200 Four Slot IndustryPack carrier"
 0x124d	0x0000	"unknown"	"Stallion|EasyConnection 8/32"
 0x124d	0x0002	"unknown"	"Stallion|EasyConnection 8/64"
 0x124d	0x0003	"unknown"	"Stallion|EasyIO"
@@ -3274,6 +3289,7 @@
 0x8086	0x84e2	"unknown"	"Intel Corporation|460GX - 84460GX AGP Bridge (GXB)"
 0x8086	0x84e3	"unknown"	"Intel Corporation|460GX - 84460GX Memory Address Controller (MAC)"
 0x8086	0x84e4	"unknown"	"Intel Corporation|460GX - 84460GX Memory Data Controller (MDC)"
+0x8086	0x84e6	"unknown"	"Intel Corporation|460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)"
 0x8086	0x9620	"unknown"	"Intel Corporation|I2O RAID PCI to PCI Bridge"
 0x8086	0x9621	"i2o_block"	"Intel Corporation|Integrated RAID"
 0x8086	0x9622	"i2o_block"	"Intel Corporation|Integrated RAID"