merge with 2.4.6-5mdk pcitable and usbtable

1 files changed, 51 insertions, 12 deletions

diff --git a/lst/pcitable b/lst/pcitable
index fce48ad3..e07f0176 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -4,8 +4,8 @@
 0x0003	0x1002	"bttv"	"ATI|TV Wonder/VE"
 0x0003	0x1461	"bttv"	"AVerMedia|TVPhone98"
 0x0004	0x1461	"bttv"	"AVerMedia|TVPhone98"
-0x003d	0x00d1	"unknown"	"Real 3D|i740 (PCI)"
 0x0012	0x11bd	"bttv"	"Pinnacle PCTV"
+0x003d	0x00d1	"unknown"	"Real 3D|i740 (PCI)"
 0x0101	0x15cb	"bttv"	"AG GMV1"
 0x0675	0x1700	"ISDN:hisax,type=12"	"Dynalink|IS64PH ISDN Adapter"
 0x0675	0x1702	"ISDN:hisax,type=12"	"Dynalink|IS64PH ISDN Adapter"
@@ -48,6 +48,7 @@
 0x0e11	0xb060	"cciss"	"Compaq|Smart Array 5300 Controller"
 0x0e11	0xb0c6	"unknown"	"Compaq|10/100TX Embedded WOL UTP Controller"
 0x0e11	0xb0d7	"unknown"	"Compaq|NC3121 (Rev A & B)"
+0x0e11	0xb178	"cciss"	""
 0x0e11	0xf130	"tlan"	"Compaq|NetFlex-3/P ThunderLAN 1.0"
 0x0e11	0xf150	"tlan"	"Compaq|NetFlex-3/P ThunderLAN 2.3"
 0x1000	0x0001	"53c7,8xx"	"Symbios|53c810"
@@ -236,6 +237,7 @@
 0x1011	0x0046	0x9005	0x1365	"aacraid"	"DEC|Dell PowerEdge RAID Controller 2"
 0x1011	0x0046	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
 0x1011	0x1065	0x1244	0x0800	"c4"	""
+0x1011	0x1065	0x1244	0x1100	"c4"	""
 0x1011	0x1065	"DAC960"	"DEC|RAID Controller"
 0x1013	0x0038	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7548"
 0x1013	0x0040	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
@@ -271,7 +273,7 @@
 0x1014	0x0007	"unknown"	"IBM|Alta MP"
 0x1014	0x000a	"unknown"	"IBM|Fire Coral"
 0x1014	0x0017	"unknown"	"IBM|CPU to PCI Bridge"
-0x1014	0x0018	"unknown"	"IBM|TR Auto LANstreamer"
+0x1014	0x0018	"lanstreamer"	"IBM|TR Auto LANstreamer"
 0x1014	0x001b	"unknown"	"IBM|GXT-150P"
 0x1014	0x001d	"unknown"	"IBM|82G2675"
 0x1014	0x0020	"unknown"	"IBM|MCA"
@@ -749,6 +751,7 @@
 0x106b	0x0017	"unknown"	"Apple Computer Inc.|Paddington Mac I/O"
 0x106b	0x0019	"usb-ohci"	"Apple|Keylargo USB"
 0x106b	0x0020	"unknown"	"Apple|Uni-North AGP"
+0x106b	0x0021	"sungem"	""
 0x106b	0x0022	"unknown"	"Apple|Keylargo I/O"
 0x106c	0x8801	"unknown"	"Hyundai Electronics America|Dual Pentium ISA/PCI Motherboard"
 0x106c	0x8802	"unknown"	"Hyundai Electronics America|PowerPC ISA/PCI Motherboard"
@@ -825,6 +828,8 @@
 0x108e	0x0001	"unknown"	"Sun|EBUS"
 0x108e	0x1000	"unknown"	"Sun|EBUS"
 0x108e	0x1001	"sunhme"	"Sun|Happy Meal"
+0x108e	0x1101	"sungem"	""
+0x108e	0x2bad	"sungem"	""
 0x108e	0x5000	"unknown"	"Sun|Simba Advanced PCI Bridge"
 0x108e	0x5043	"unknown"	"Sun|SunPCI Co-processor"
 0x108e	0x8000	"unknown"	"Sun|PCI Bus Module"
@@ -1178,6 +1183,7 @@
 0x10ee	0x3fc1	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8"
 0x10ee	0x3fc2	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8 Pro"
 0x10ee	0x3fc3	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8 Pad"
+0x10ee	0x4020	"tpam"	""
 0x10ef	0x8154	"unknown"	"Racore Computer Products, Inc.|M815x Token Ring Adapter"
 0x10f1	0x1566	"unknown"	"Tyan Computer|IDE/SCSI"
 0x10f1	0x1677	"unknown"	"Tyan Computer|Multimedia"
@@ -1371,8 +1377,8 @@
 0x1119	0x0211	"gdth"	"ICP Vortex|GDT 6x29RD"
 0x1119	0x0260	"gdth"	"ICP Vortex|GDT 7x19RN"
 0x1119	0x0261	"gdth"	"ICP Vortex|GDT 7x29RN"
-0x111a	0x0000	"unknown"	"Efficient Networks, Inc|155P-MF1 (FPGA)"
-0x111a	0x0002	"unknown"	"Efficient Networks, Inc|155P-MF1 (ASIC)"
+0x111a	0x0000	"eni"	"Efficient Networks, Inc|155P-MF1 (FPGA)"
+0x111a	0x0002	"eni"	"Efficient Networks, Inc|155P-MF1 (ASIC)"
 0x111a	0x0003	"unknown"	"Efficient Networks, Inc|ENI-25P ATM Adapter"
 0x111a	0x0005	"unknown"	"Efficient Networks, Inc|ENI-25P ATM Adapter"
 0x111a	0x0007	"unknown"	"Efficient Networks, Inc|SpeedStream ADSL"
@@ -1439,7 +1445,7 @@
 0x1142	0x6426	"unknown"	"Alliance Semiconductor|GUI Accelerator"
 0x1142	0x643d	"Card:AT3D"	"Alliance|ProMotion AT3D"
 0x1144	0x0001	"unknown"	"Cincinnati Milacron|Noservo controller"
-0x1148	0x4000	"unknown"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
+0x1148	0x4000	"skfp"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
 0x1148	0x4200	"sktr"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
 0x1148	0x4300	"sk98lin"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
 0x114a	0x7587	"unknown"	"VMIC|VMIVME-7587"
@@ -1523,7 +1529,7 @@
 0x1179	0x0617	"unknown"	"Toshiba|ToPIC95 PCI to Cardbus Bridge with ZV Support"
 0x1179	0x0618	"unknown"	"Toshiba|CPU to PCI and PCI to ISA bridge"
 0x1179	0x0701	"toshoboe"	"Toshiba|FIR Port"
-0x1179	0x0d01	"unknown"	"Toshiba|FIR Port Type-DO"
+0x1179	0x0d01	"toshoboe"	"Toshiba|FIR Port Type-DO"
 0x117e	0x0001	"unknown"	"T/R Systems|Printer Host"
 0x1180	0x0465	"i82365"	"Ricoh Co Ltd|RL5c465"
 0x1180	0x0466	"i82365"	"Ricoh Co Ltd|RL5c466"
@@ -1536,6 +1542,7 @@
 0x1186	0x1002	"sundance"	"D-Link Inc|DFE 550 TX"
 0x1186	0x1100	"tulip"	"D-Link Inc|Fast Ethernet Adapter"
 0x1186	0x1300	"8139too"	"D-Link Inc|DFE 538 TX"
+0x1186	0x4000	"dl2k"	""
 0x1189	0x1592	"unknown"	"Matsushita Electronics Co|VL/PCI Bridge"
 0x118c	0x0014	"unknown"	"Corollary, Inc|PCIB [C-bus II to PCI bus host bridge chip]"
 0x118d	0x0001	"unknown"	"BitFlow Inc|Raptor-PCI framegrabber"
@@ -1581,7 +1588,7 @@
 0x11ab	0xf003	"unknown"	"Galileo Technology Ltd.|GT-64010 Primary Image Piranha Image Generator"
 0x11ad	0x0002	"tulip"	"Lite-On|LNE100TX"
 0x11ad	0xc115	"tulip"	"Lite-On|LC82C115 PNIC-II"
-0x11b0	0x0002	"unknown"	"V3 Semiconductor Inc.|V300PSC"
+0x11b0	0x0002	"sdladrv"	"V3 Semiconductor Inc.|V300PSC"
 0x11b0	0x0292	"unknown"	"V3 Semiconductor Inc.|V292PBC [Am29030/40 Bridge]"
 0x11b0	0x0960	"unknown"	"V3 Semiconductor Inc.|V96xPBC"
 0x11b0	0xc960	"unknown"	"V3 Semiconductor Inc.|V96DPC"
@@ -1767,6 +1774,7 @@
 0x127a	0x4321	"unknown"	"Rockwell Semiconductor Systems|HCF 56k Data Fax PCI Modem"
 0x127a	0x4322	"unknown"	"Rockwell Semiconductor Systems|Riptide PCI Game Controller"
 0x127a	0x8234	"unknown"	"Rockwell International|RapidFire 616X ATM155 Adapter"
+0x1282	0x9009	"dmfe"	""
 0x1282	0x9100	"tulip"	"Davicom|DM9100"
 0x1282	0x9102	"tulip"	"Davicom|Ethernet 100/10 MBit DM9102"
 0x1282	0x9132	"dmfe"	""
@@ -1916,6 +1924,7 @@
 0x135e	0x7801	"unknown"	"Sealevel Systems Inc|Eight Port RS-232 Interface"
 0x135e	0x8001	"unknown"	"Sealevel Systems Inc|8001 Digital I/O Adapter"
 0x1365	0x9050	"hysdn"	""
+0x136b	0xff01	"meye"	""
 0x1385	0x620a	"acenic"	"Netgear|GA620"
 0x1385	0x630a	"acenic"	""
 0x1389	0x0001	"unknown"	"Applicom International|PCI1500PFB [Intelligent fieldbus adaptor]"
@@ -1964,9 +1973,22 @@
 0x14b3	0x0000	"unknown"	"XPEED Inc|DSL NIC"
 0x14b7	0x0001	"unknown"	"PROXIM Inc|Symphony 4110"
 0x14b9	0x0001	"aironet4500_card"	"AIRONET Wireless Communications|PC4800"
+0x14b9	0x0340	"airo"	""
+0x14b9	0x0350	"airo"	""
 0x14b9	0x4500	"aironet4500_card"	""
 0x14b9	0x4800	"aironet4500_card"	""
+0x14d2	0x8011	"parport_serial"	""
+0x14d2	0x8021	"parport_serial"	""
+0x14db	0x2110	"parport_serial"	""
+0x14db	0x2111	"parport_serial"	""
+0x14db	0x2112	"parport_serial"	""
 0x14db	0x2120	"unknown"	"AFAVLAB Technology Inc|TK9902"
+0x14db	0x2140	"parport_serial"	""
+0x14db	0x2141	"parport_serial"	""
+0x14db	0x2142	"parport_serial"	""
+0x14db	0x2160	"parport_serial"	""
+0x14db	0x2161	"parport_serial"	""
+0x14db	0x2162	"parport_serial"	""
 0x14dc	0x0000	"unknown"	"Amplicon Liveline Ltd|PCI230"
 0x14dc	0x0001	"unknown"	"Amplicon Liveline Ltd|PCI242"
 0x14dc	0x0002	"unknown"	"Amplicon Liveline Ltd|PCI244"
@@ -1999,6 +2021,9 @@
 0x1507	0x4802	"unknown"	"Motorola|Falcon"
 0x1507	0x4803	"unknown"	"Motorola|Hawk"
 0x1507	0x4806	"unknown"	"Motorola|CPX8216"
+0x1516	0x0800	"fealnx"	""
+0x1516	0x0803	"fealnx"	""
+0x1516	0x0891	"fealnx"	""
 0x151a	0x1002	"unknown"	"Globetek|PCI-1002"
 0x151a	0x1004	"unknown"	"Globetek|PCI-1004"
 0x151a	0x1008	"unknown"	"Globetek|PCI-1008"
@@ -2034,6 +2059,8 @@
 0x15ad	0x0710	"Card:VMware virtual video card"	"VMWare Inc|Virtual SVGA"
 0x15b0	0x2bd0	"ISDN:hisax,type=35"	"Zoltrix|2BD0 ISDN Adapter"
 0x15dc	0x0001	"unknown"	"Litronic Inc|Argus 300 PCI Cryptography Module"
+0x1619	0x0400	"farsync"	""
+0x1619	0x0440	"farsync"	""
 0x1813	0x4000	"unknown"	"Modem Silicon Operation|MD563X Host Acceletrated Modem"
 0x1850	0x1851	"bttv"	"Chronos|Video Shuttle II"
 0x1851	0x1851	"bttv"	"CyberMail AV"
@@ -2092,7 +2119,7 @@
 0x4033	0x1360	"8139too"	"Addtron Technology|8139 10/100BaseTX"
 0x4050	0x10fc	"bttv"	"I-O Data Co. GV-BCV4/PCI"
 0x4500	0x0070	"bttv"	"Hauppauge WinTV/PVR"
-0x4916	0x1960	"unknown"	"RedCreek Communications Inc|RedCreek PCI adapter"
+0x4916	0x1960	"rcpci"	"RedCreek Communications Inc|RedCreek PCI adapter"
 0x494f	0x22c0	"wdt_pci"	""
 0x4a14	0x5000	"ne2k-pci"	"NetVin|NV5000SC"
 0x4b10	0x3080	"unknown"	"Buslogic Inc|SCSI Host Adapter"
@@ -2207,8 +2234,14 @@
 0x8086	0x0960	"unknown"	"Intel Corporation|80960RP [i960 RP Microprocessor/Bridge]"
 0x8086	0x1000	"e1000"	"Intel Corporation|82542 Gigabit Ethernet Adapter"
 0x8086	0x1001	"e1000"	"Intel Corporation|82543 Gigabit Ethernet Adapter"
+0x8086	0x1004	"e1000"	""
 0x8086	0x1029	"eepro100"	""
 0x8086	0x1030	"eepro100"	"Intel Corporation|82559 InBusiness 10/100"
+0x8086	0x1031	"e100"	""
+0x8086	0x1032	"e100"	""
+0x8086	0x1033	"e100"	""
+0x8086	0x1034	"e100"	""
+0x8086	0x1038	"e100"	""
 0x8086	0x1130	"agpgart"	"Intel Corporation|82815 815 Chipset Host Bridge and Memory Controller Hub"
 0x8086	0x1132	"Card:Intel 815"	"Intel Corporation|82815 CGC [Chipset Graphics Controller]"
 0x8086	0x1161	"unknown"	"Intel Corporation|82806AA PCI64 Hub Advanced Programmable Interrupt Controller"
@@ -2241,28 +2274,30 @@
 0x8086	0x1a21	"agpgart"	"Intel Corporation|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
 0x8086	0x1a23	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset AGP Bridge"
 0x8086	0x1a24	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset PCI Bridge (Hub B)"
-0x8086	0x2410	"unknown"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
+0x8086	0x2410	"i810-tco"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
 0x8086	0x2411	"unknown"	"Intel Corporation|82801AA 810 Chipset IDE Controller"
 0x8086	0x2412	"usb-uhci"	"Intel Corporation|82801AA 810 Chipset USB Controller"
 0x8086	0x2413	"unknown"	"Intel Corporation|82801AA 810 Chipset SMBus Controller"
 0x8086	0x2415	"i810_audio"	"Intel Corporation|82801AA 810 Chipset AC'97 Audio Controller"
 0x8086	0x2416	"unknown"	"Intel Corporation|82801AA 810 Chipset AC'97 PCI Modem"
 0x8086	0x2418	"i810_rng"	"Intel Corporation|82801AA 810 Chipset Hub to PCI Bridge"
-0x8086	0x2420	"unknown"	"Intel Corporation|82801AB 810 Chipset LPC Interface Bridge"
+0x8086	0x2420	"i810-tco"	"Intel Corporation|82801AB 810 Chipset LPC Interface Bridge"
 0x8086	0x2421	"unknown"	"Intel Corporation|82801AB 810 Chipset IDE Controller"
 0x8086	0x2422	"usb-uhci"	"Intel Corporation|82801AB 810 Chipset USB Controller"
 0x8086	0x2423	"unknown"	"Intel Corporation|82801AB 810 Chipset SMBus Controller"
 0x8086	0x2425	"i810_audio"	"Intel Corporation|82901 810 Chipset AC'97 Audio Controller"
 0x8086	0x2426	"unknown"	"Intel Corporation|82801AB 810 Chipset AC'97 PCI Modem"
 0x8086	0x2428	"i810_rng"	"Intel Corporation|82801AB 810 Chipset Hub to PCI Bridge"
-0x8086	0x2440	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
+0x8086	0x2440	"i810-tco"	"Intel Corporation|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
 0x8086	0x2442	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub A)"
 0x8086	0x2443	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset SMBus"
 0x8086	0x2444	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub B)"
 0x8086	0x2445	"i810_audio"	"Intel Corporation|ICH2 810 Chipset AC'97 Audio Controller"
 0x8086	0x2449	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
 0x8086	0x244b	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset IDE U100"
+0x8086	0x244c	"sonypi"	""
 0x8086	0x244e	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset PCI"
+0x8086	0x2485	"i810_audio"	""
 0x8086	0x2500	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2501	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x250b	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge"
@@ -2282,7 +2317,7 @@
 0x8086	0x7110	"unknown"	"Intel Corporation|82371AB PIIX4 ISA"
 0x8086	0x7111	"unknown"	"Intel Corporation|82371AB PIIX4 IDE"
 0x8086	0x7112	"usb-uhci"	"Intel Corporation|82371AB PIIX4 USB"
-0x8086	0x7113	"unknown"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
+0x8086	0x7113	"sonypi"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
 0x8086	0x7120	"agpgart"	"Intel Corporation|82810 GMCH [Graphics Memory Controller Hub]"
 0x8086	0x7121	"Card:Intel 810"	"Intel Corporation|82810 CGC [Chipset Graphics Controller]"
 0x8086	0x7122	"agpgart"	"Intel Corporation|82810-DC100 GMCH [Graphics Memory Controller Hub]"
@@ -2399,6 +2434,7 @@
 0x9004	0x8878	"aic7xxx"	"Adaptec|7888"
 0x9004	0x8b78	"aic7xxx"	"Adaptec|ABA-1030"
 0x9004	0xec78	"aic7xxx"	"Adaptec|AHA-4944W/UW"
+0x9004	0xffff	"aic7xxx"	""
 0x9005	0x0010	"aic7xxx"	"Adaptec|AHA-2940U2/W"
 0x9005	0x0011	"aic7xxx"	"Adaptec|2930U2"
 0x9005	0x0013	"aic7xxx"	"Adaptec|78902"
@@ -2422,9 +2458,12 @@
 0x9005	0x00cf	"aic7xxx"	"Adaptec|7899P"
 0x9005	0x1364	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
 0x9005	0x1365	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
+0x9005	0xffff	"aic7xxx"	""
 0x907f	0x2015	"unknown"	"Atronics|IDE-2015PL"
 0x9412	0x6565	"unknown"	"Holtek|6565"
 0x9699	0x6565	"unknown"	"Omni Media Technology Inc|6565"
+0x9710	0x9735	"parport_serial"	""
+0x9710	0x9835	"parport_serial"	""
 0xd4d4	0x0601	"unknown"	"Dy4 Systems Inc|PCI Mezzanine Card"
 0xe000	0xe000	"unknown"	"Winbond|W89C940"
 0xe159	0x0001	"ISDN:hisax,type=20"	"Tiger Jet Network Inc.|NETjet PCI"