Patched with latest Mandriva updates. I notice that this doesn't support the GeForce 8xxx series, which will need to be fixed before we release 2007.0, or we'll end up with quite a few bug reports.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/hwdata/trunk@5 84bf7363-891f-0410-9a98-864156d94163

2 files changed, 72 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 16a94df..d7859c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-# ChangeLog for igentoo/src/hwdata
+# ChangeLog for hwdata
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/hwdata/ChangeLog,v 1.3 2006/05/16 21:31:08 wolf31o2 Exp $
 
+  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> pcitable:
+  Patched with latest Mandriva updates. I notice that this doesn't support the
+  GeForce 8xxx series, which will need to be fixed before we release 2007.0,
+  or we'll end up with quite a few bug reports.
+
   15 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Sync pcitable with Mandriva.  Update Cards for GeForce 6 and 7 series.
 
diff --git a/pcitable b/pcitable
index b898d20..c90ac74 100644
--- a/pcitable
+++ b/pcitable
@@ -113,12 +113,12 @@
 0x0e11	0x409c	"cciss"	"Compaq|Smart Array 6400"
 0x0e11	0x409d	"cciss"	"Compaq|Smart Array 6400 EM"
 0x0e11	0x6010	"unknown"	"Compaq|HotPlug PCI Bridge 6010"
-0x0e11	0x7020	"usb-ohci"	"Compaq|USB Controller"
+0x0e11	0x7020	"ohci-hcd"	"Compaq|USB Controller"
 0x0e11	0xa0ec	"unknown"	"Compaq|Fibre Channel Host Controller /P"
 0x0e11	0xa0f0	"unknown"	"Compaq|Advanced System Management Controller"
 0x0e11	0xa0f3	"unknown"	"Compaq|Triflex PCI to ISA Bridge"
 0x0e11	0xa0f7	"unknown"	"Compaq|Cirrus Logic VGA Video Controller"
-0x0e11	0xa0f8	"usb-ohci"	"Compaq|USB Open Host Controller"
+0x0e11	0xa0f8	"ohci-hcd"	"Compaq|USB Open Host Controller"
 0x0e11	0xa0fc	"cpqfc"	"Compaq|Fibre Channel Host Controller"
 0x0e11	0xae10	"cpqarray"	"Compaq|Smart-2/P RAID Controller"
 0x0e11	0xae29	"unknown"	"Compaq|MIS-L"
@@ -415,7 +415,7 @@
 0x1002	0x4c52	"Card:ATI Rage Mobility"	"ATI Technologies Inc.|Rage Mobility P/M"
 0x1002	0x4c53	"Card:ATI Rage Mobility"	"ATI Technologies Inc.|Rage Mobility L"
 0x1002	0x4c54	"Card:ATI Mach64 Utah"	"ATI Technologies Inc.|264LT [Mach64 LT]"
-0x1002	0x4c57	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|Radeon Mobility M7 LW (AGP)"
+0x1002	0x4c57	"Card:ATI Radeon"	"ATI Technologies Inc.|Radeon Mobility M7 LW (AGP)"
 0x1002	0x4c58	"Card:ATI Radeon"	"ATI Technologies Inc.|Mobility FireGL 7800 M7 LX (AGP)"
 0x1002	0x4c59	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|Radeon Mobility M6 LY (AGP)"
 0x1002	0x4c5a	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|Radeon Mobility M6 LZ (AGP)"
@@ -618,11 +618,11 @@
 0x1002	0x5e48	"Card:ATI Radeon"	"ATI Technologies Inc|RV410 [FireGL V5000]"
 0x1002	0x5e49	"unknown"	"ATI Technologies Inc|RV410 [FireGL V3300]"
 0x1002	0x5e4a	"Card:ATI Radeon"	"ATI Technologies Inc|RV410 [Radeon X700XT]"
-0x1002	0x5e4b	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E)"
+0x1002	0x5e4b	"Card:ATI Radeon"	"ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E)"
 0x1002	0x5e4c	"Card:ATI Radeon"	"ATI Technologies Inc|RV410 [Radeon X700SE]"
 0x1002	0x5e4d	"Card:ATI Radeon"	"ATI Technologies Inc.|RV410 Radeon X700 (PCI-E)"
 0x1002	0x5e4f	"Card:ATI Radeon"	"ATI Technologies Inc|RV410 [Radeon X700]"
-0x1002	0x5e6b	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E) (Secondary)"
+0x1002	0x5e6b	"Card:ATI Radeon"	"ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E) (Secondary)"
 0x1002	0x5e6d	"unknown"	"ATI Technologies Inc.|RV410 Radeon X700 (PCI-E) (Secondary)"
 0x1002	0x5f57	"unknown"	"ATI Technologies Inc|R423 [Radeon X800XT (PCIE)]"
 0x1002	0x700f	"unknown"	"ATI Technologies Inc.|U1/A3 AGP Bridge [IGP 320M]"
@@ -1011,23 +1011,23 @@
 0x1022	0x7400	"unknown"	"Advanced Micro Devices|AMD-755 PCI to ISA bridge"
 0x1022	0x7401	"amd74xx"	"Advanced Micro Devices|AMD-755 (Cobra) Bus Master IDE controller"
 0x1022	0x7403	"unknown"	"Advanced Micro Devices|AMD-755 Power Management Controller"
-0x1022	0x7404	"usb-ohci"	"Advanced Micro Devices|AMD-755 PCI to USB Open Host Controller"
+0x1022	0x7404	"ohci-hcd"	"Advanced Micro Devices|AMD-755 PCI to USB Open Host Controller"
 0x1022	0x7408	"unknown"	"Advanced Micro Devices|AMD-756 PCI to ISA bridge"
 0x1022	0x7409	"amd74xx"	"Advanced Micro Devices|AMD-756 (Viper) Bus Master IDE controller"
 0x1022	0x740b	"i2c-amd756"	"Advanced Micro Devices|AMD-756 Power Management Controller"
-0x1022	0x740c	"usb-ohci"	"Advanced Micro Devices|AMD-756 PCI to USB Open Host Controller"
+0x1022	0x740c	"ohci-hcd"	"Advanced Micro Devices|AMD-756 PCI to USB Open Host Controller"
 0x1022	0x7410	"amd76xrom"	"Advanced Micro Devices|AMD-765 [Viper] ISA"
 0x1022	0x7411	"amd74xx"	"Advanced Micro Devices|AMD-765 [Viper] IDE"
 0x1022	0x7412	"unknown"	"Advanced Micro Devices|AMD-766 USB Controller"
 0x1022	0x7413	"i2c-amd756"	"Advanced Micro Devices|AMD-765 [Viper] ACPI"
-0x1022	0x7414	"usb-ohci"	"Advanced Micro Devices|AMD-765 [Viper] USB"
+0x1022	0x7414	"ohci-hcd"	"Advanced Micro Devices|AMD-765 [Viper] USB"
 0x1022	0x7440	"amd76xrom"	"Advanced Micro Devices|AMD-768 PCI to ISA Bridge"
 0x1022	0x7441	"amd74xx"	"Advanced Micro Devices|AMD-768 EIDE Controller"
 0x1022	0x7443	"hw_random"	"Advanced Micro Devices|AMD-768 ACPI Controller"
-0x1022	0x7445	"i810_audio"	"Advanced Micro Devices|AMD-768 Audio"
+0x1022	0x7445	"snd-intel8x0"	"Advanced Micro Devices|AMD-768 Audio"
 0x1022	0x7446	"slamr"	"Advanced Micro Devices|AMD-768 [Opus] MC97 Modem (Smart Link HAMR5600 compatible)"
 0x1022	0x7448	"unknown"	"Advanced Micro Devices|AMD-768 PCI to PCI Bridge?"
-0x1022	0x7449	"usb-ohci"	"Advanced Micro Devices|AMD-768 USB Controller"
+0x1022	0x7449	"ohci-hcd"	"Advanced Micro Devices|AMD-768 USB Controller"
 0x1022	0x7450	"unknown"	"Advanced Micro Devices|AMD-8131 PCI-X Bridge"
 0x1022	0x7451	"unknown"	"Advanced Micro Devices|AMD-8131 PCI-X APIC"
 0x1022	0x7454	"amd64-agp"	"Advanced Micro Devices|AMD-8151 System Controller"
@@ -1035,10 +1035,10 @@
 0x1022	0x7458	"unknown"	"Advanced Micro Devices|AMD-8132 PCI-X Bridge"
 0x1022	0x7459	"unknown"	"Advanced Micro Devices|AMD-8132 PCI-X IOAPIC"
 0x1022	0x7460	"unknown"	"Advanced Micro Devices|AMD-8111 PCI"
-0x1022	0x7461	"usb-ohci"	"Advanced Micro Devices|AMD-8111 USB"
+0x1022	0x7461	"ohci-hcd"	"Advanced Micro Devices|AMD-8111 USB"
 0x1022	0x7462	"amd8111e"	"Advanced Micro Devices|AMD-8111 Ethernet"
 0x1022	0x7463	"unknown"	"Advanced Micro Devices|Enhanced USB Controller"
-0x1022	0x7464	"usb-ohci"	"Advanced Micro Devices|AMD-8111 USB"
+0x1022	0x7464	"ohci-hcd"	"Advanced Micro Devices|AMD-8111 USB"
 0x1022	0x7468	"amd76xrom"	"Advanced Micro Devices|AMD-8111 LPC"
 0x1022	0x7469	"amd74xx"	"Advanced Micro Devices|AMD-8111 IDE"
 0x1022	0x746a	"i2c-amd8111"	"Advanced Micro Devices|AMD-8111 SMBus 2.0"
@@ -1364,7 +1364,7 @@
 0x1033	0x002a	"unknown"	"NEC|PowerVR 3D"
 0x1033	0x002c	"unknown"	"NEC Corp.|Star Alpha 2"
 0x1033	0x002d	"unknown"	"NEC Corp.|PCI to C-bus Bridge"
-0x1033	0x0035	"usb-ohci"	"NEC|USB"
+0x1033	0x0035	"ohci-hcd"	"NEC|USB"
 0x1033	0x0036	"unknown"	"NEC Corp.|uPD98409 NEASCOT-S40C ATM Light SAR Controller"
 0x1033	0x003b	"unknown"	"NEC Corp.|PCI to C-bus Bridge"
 0x1033	0x003e	"vrc4173_cardu"	"NEC|NAPCCARD Cardbus Controller [VRC4173 CARDU]"
@@ -1495,7 +1495,7 @@
 0x1039	0x6326	"Card:SiS 6326"	"Silicon Integrated Systems [SiS]|86C326"
 0x1039	0x6330	"Card:SiS Real256E"	"Silicon Integrated Systems [SiS]|SiS Real256E"
 0x1039	0x6972	"unknown"	"Silicon Integrated Systems [SiS]| "
-0x1039	0x7001	"usb-ohci"	"Silicon Integrated Systems [SiS]|7001 USB"
+0x1039	0x7001	"ohci-hcd"	"Silicon Integrated Systems [SiS]|7001 USB"
 0x1039	0x7002	"ehci-hcd"	"Silicon Integrated Systems [SiS]|7002 USB 2.0 Controller"
 0x1039	0x7005	"unknown"	"Silicon Integrated Systems [SiS]|SiS551/2 Memory Stick Controller"
 0x1039	0x7007	"ohci1394"	"Silicon Integrated Systems [SiS]|OHCI Compliant FireWire Controller"
@@ -1595,7 +1595,7 @@
 0x1044	0xa501	"dpt_i2o"	"Distributed Processing Tech|SmartRAID V Controller"
 0x1044	0xa511	"dpt_i2o"	"Distributed Processing Tech|Raptor SmartRAID Controller"
 0x1045	0x0005	"unknown"	"OPTi Inc.| "
-0x1045	0xa0f8	"usb-ohci"	"OPTi Inc.|82C750 [Vendetta] USB Controller"
+0x1045	0xa0f8	"ohci-hcd"	"OPTi Inc.|82C750 [Vendetta] USB Controller"
 0x1045	0xc101	"unknown"	"OPTi Inc.|92C264"
 0x1045	0xc178	"unknown"	"OPTi Inc.|92C178"
 0x1045	0xc556	"unknown"	"OPTi Inc.|82X556 [Viper]"
@@ -1612,7 +1612,7 @@
 0x1045	0xc824	"unknown"	"OPTi Inc.|82C824"
 0x1045	0xc825	"unknown"	"OPTi Inc.|82C825 [Firebridge 2]"
 0x1045	0xc832	"unknown"	"OPTi Inc.|82C832"
-0x1045	0xc861	"usb-ohci"	"OPTi Inc.|82C861"
+0x1045	0xc861	"ohci-hcd"	"OPTi Inc.|82C861"
 0x1045	0xc881	"unknown"	"OPTi Inc.|82C881 FireLink 1394 OHCI Link Controller"
 0x1045	0xc895	"unknown"	"OPTi Inc.|82C895"
 0x1045	0xc935	"unknown"	"OPTi Inc.|EV1935 ECTIVA MachOne PCI Audio"
@@ -1781,7 +1781,7 @@
 0x1055	0x9178	"slamr"	"EFAR Microsystems|Modem (SmartLink)"
 0x1055	0x9460	"unknown"	"EFAR Microsystems|PCI to ISA Bridge"
 0x1055	0x9461	"unknown"	"Standard Microsystems Corp.|SLC90E66 Victory66 UDMA EIDE Controller"
-0x1055	0x9462	"usb-ohci"	"EFAR Microsystems|USB Universal Host Controller [OHCI]"
+0x1055	0x9462	"ohci-hcd"	"EFAR Microsystems|USB Universal Host Controller [OHCI]"
 0x1055	0x9463	"i2c-piix4"	"EFAR Microsystems|Power Management Controller [Bridge]"
 0x1057	0x0000	"unknown"	"Motorola| "
 0x1057	0x0001	"unknown"	"Motorola|MPC105 [Eagle]"
@@ -1968,7 +1968,7 @@
 0x106b	0x0010	"unknown"	"Apple Computer Inc.|Heathrow Mac I/O Controller"
 0x106b	0x0017	"unknown"	"Apple Computer Inc.|Paddington Mac I/O Controller"
 0x106b	0x0018	"ohci1394"	"Apple Computer Inc.|UniNorth FireWire Controller"
-0x106b	0x0019	"usb-ohci"	"Apple Computer Inc.|Keylargo USB Controller"
+0x106b	0x0019	"ohci-hcd"	"Apple Computer Inc.|Keylargo USB Controller"
 0x106b	0x001e	"unknown"	"Apple Computer Inc.|UniNorth Host-PCI Bridge"
 0x106b	0x001f	"unknown"	"Apple Computer Inc.|UniNorth Host-PCI Bridge"
 0x106b	0x0020	"uninorth-agp"	"Apple Computer Inc.|Uni-North AGP Interface"
@@ -1976,7 +1976,7 @@
 0x106b	0x0022	"dmasound_pmac"	"Apple Computer Inc.|Keylargo Mac I/O Controller"
 0x106b	0x0024	"sungem"	"Apple Computer Inc.|GMAC Ethernet controller"
 0x106b	0x0025	"unknown"	"Apple Computer Inc.|Pangea Mac I/O Controller"
-0x106b	0x0026	"usb-ohci"	"Apple Computer Inc.|KeyLargo/Pangea USB"
+0x106b	0x0026	"ohci-hcd"	"Apple Computer Inc.|KeyLargo/Pangea USB"
 0x106b	0x0027	"uninorth-agp"	"Apple Computer Inc.|Pangea AGP Interface"
 0x106b	0x0028	"unknown"	"Apple Computer Inc.|Pangea Host-PCI bridge"
 0x106b	0x0029	"unknown"	"Apple Computer Inc.|Pangea Host-PCI bridge"
@@ -1992,8 +1992,8 @@
 0x106b	0x0036	"unknown"	"Apple Computer Inc.|UniNorth 2 Internal PCI"
 0x106b	0x003b	"unknown"	"Apple Computer Inc.|UniNorth/Intrepid ATA/100"
 0x106b	0x003e	"unknown"	"Apple Computer Inc.|KeyLargo/Intrepid Mac I/O"
-0x106b	0x003f	"usb-ohci"	"Apple Computer Inc.|KeyLargo/Intrepid USB"
-0x106b	0x0040	"usb-ohci"	"Apple Computer Inc.|K2 KeyLargo USB"
+0x106b	0x003f	"ohci-hcd"	"Apple Computer Inc.|KeyLargo/Intrepid USB"
+0x106b	0x0040	"ohci-hcd"	"Apple Computer Inc.|K2 KeyLargo USB"
 0x106b	0x0041	"unknown"	"Apple Computer Inc.|K2 KeyLargo Mac/IO"
 0x106b	0x0042	"ohci1394"	"Apple Computer Inc.|K2 FireWire"
 0x106b	0x0043	"unknown"	"Apple Computer Inc.|K2 ATA/100"
@@ -2145,7 +2145,7 @@
 0x108e	0x1100	"unknown"	"Sun Microsystems Computer Corp.|RIO EBUS"
 0x108e	0x1101	"sungem"	"Sun Microsystems Computer Corp.|PCIO Happy Meal Ethernet"
 0x108e	0x1102	"ohci1394"	"Sun Microsystems Computer Corp.|RIO 1394"
-0x108e	0x1103	"usb-ohci"	"Sun Microsystems Computer Corp.|RIO USB"
+0x108e	0x1103	"ohci-hcd"	"Sun Microsystems Computer Corp.|RIO USB"
 0x108e	0x1648	"unknown"	"Sun Microsystems Computer Corp.|[bge] Gigabit Ethernet"
 0x108e	0x2bad	"sungem"	"Sun Microsystems Computer Corp.|GEM"
 0x108e	0x5000	"unknown"	"Sun Microsystems Computer Corp.|Simba Advanced PCI Bridge"
@@ -2249,8 +2249,8 @@
 0x1095	0x0648	"cmd64x"	"CMD Technology Inc.|PCI0648 (Ultra DMA PCI-IDE/ATA Chip)"
 0x1095	0x0649	"cmd64x"	"CMD Technology Inc.|PCI0649 (Ultra ATA/100 Jost Ctrlr)"
 0x1095	0x0650	"unknown"	"CMD Technology Inc.|PBC0650A (Fast SCSI-II Ctrlr)"
-0x1095	0x0670	"usb-ohci"	"CMD Technology Inc.|USB0670 (PCI-USB ASIC)"
-0x1095	0x0673	"usb-ohci"	"CMD Technology Inc.|USB0673 PCI-USB ASIC"
+0x1095	0x0670	"ohci-hcd"	"CMD Technology Inc.|USB0670 (PCI-USB ASIC)"
+0x1095	0x0673	"ohci-hcd"	"CMD Technology Inc.|USB0673 PCI-USB ASIC"
 0x1095	0x0680	"siimage"	"CMD Technology Inc.|PCI-680 UltraATA/133 EIDE Controller"
 0x1095	0x3112	"sata_sil"	"Silicon Image Inc.|Sil3112A Serial ATA"
 0x1095	0x3114	"sata_sil"	"Silicon Image inc.|Sil3114A Serial ATA"
@@ -2495,7 +2495,7 @@
 0x10b7	0x1007	"unknown"	"3Com Corp.|3C556 V.90 Mini-PCI Modem"
 0x10b7	0x1201	"3c59x"	"3Com Corp.|3c982-TXM 10/100baseTX Dual Port A [Hydra]"
 0x10b7	0x1202	"3c59x"	"3Com Corp.|3c982-TXM 10/100baseTX Dual Port B [Hydra]"
-0x10b7	0x1700	"sk98lin"	"3Com Corp.|3C940 10/100/1000 LAN"
+0x10b7	0x1700	"skge"	"3Com Corp.|3C940 10/100/1000 LAN"
 0x10b7	0x1f1f	"unknown"	"3Com Corp.|3CRWE777A AirConnect Wireless LAN PCI Card"
 0x10b7	0x3390	"tmspci"	"3Com Corp.|Token Link Velocity"
 0x10b7	0x3590	"3c359"	"3Com Corp.|3c359 TokenLink Velocity XL"
@@ -2527,7 +2527,7 @@
 0x10b7	0x7940	"3c59x"	"3Com Corp.|3c803 FDDILink DAS Controller"
 0x10b7	0x7980	"3c59x"	"3Com Corp.|3c803 FDDILink UTP Controller"
 0x10b7	0x7990	"3c59x"	"3Com Corp.|3c804 FDDILink SAS Controller"
-0x10b7	0x80eb	"sk98lin"	"3Com Corp.|3c940B 10/100/1000Base-T"
+0x10b7	0x80eb	"skge"	"3Com Corp.|3c940B 10/100/1000Base-T"
 0x10b7	0x8811	"unknown"	"3Com Corp.|Token ring"
 0x10b7	0x9000	"3c59x"	"3Com Corp.|3c900 10BaseT [Boomerang]"
 0x10b7	0x9001	"3c59x"	"3Com Corp.|3c900 Combo [Boomerang]"
@@ -2623,7 +2623,7 @@
 0x10b9	0x5228	"alim15x3"	"Acer Labs Inc.|M5228 ALi ATA/RAID Controller"
 0x10b9	0x5229	"alim15x3"	"Acer Labs Inc.|M5229 IDE"
 0x10b9	0x5235	"unknown"	"Acer Labs Inc.|M5225"
-0x10b9	0x5237	"usb-ohci"	"Acer Labs Inc.|M5237 (USB)"
+0x10b9	0x5237	"ohci-hcd"	"Acer Labs Inc.|M5237 (USB)"
 0x10b9	0x5239	"ehci-hcd"	"Acer Labs Inc.|USB 2.0 Controller"
 0x10b9	0x5240	"unknown"	"Acer Labs Incorporated (ALI)|EIDE Controller"
 0x10b9	0x5241	"unknown"	"Acer Labs Incorporated (ALI)|PCMCIA Bridge"
@@ -2801,7 +2801,7 @@
 0x10de	0x0064	"i2c-nforce2"	"nVidia Corp.|nForce2 SMBus 2.0 Controller"
 0x10de	0x0065	"amd74xx"	"nVidia Corp.|nForce2 UDMA 100/133 IDE Controller"
 0x10de	0x0066	"forcedeth"	"nVidia Corp.|nForce2 MCP Networking Adapter"
-0x10de	0x0067	"usb-ohci"	"nVidia Corp.|nForce2 USB 1.0 OHCI Controller"
+0x10de	0x0067	"ohci-hcd"	"nVidia Corp.|nForce2 USB 1.0 OHCI Controller"
 0x10de	0x0068	"ehci-hcd"	"nVidia Corp.|nForce2 USB 2.0 Enhanced Controller"
 0x10de	0x0069	"snd-intel8x0m"	""
 0x10de	0x006a	"snd-intel8x0"	"nVidia Corp.|nForce2 Audio Codec Interface"
@@ -2844,7 +2844,7 @@
 0x10de	0x00d4	"i2c-nforce2"	"nVidia Corp.|nForce MCP3? SMBus Controller"
 0x10de	0x00d5	"amd74xx"	"nVidia Corp.|nForce3 IDE"
 0x10de	0x00d6	"forcedeth"	"nVidia Corp.|nForce3 MCP Networking Adapter"
-0x10de	0x00d7	"usb-ohci"	"nVidia Corp.|nForce3 USB 1.1"
+0x10de	0x00d7	"ohci-hcd"	"nVidia Corp.|nForce3 USB 1.1"
 0x10de	0x00d8	"ehci-hcd"	"nVidia Corp.|nForce3 USB 2.0"
 0x10de	0x00d9	"snd-intel8x0m"	"nVidia Corporation|nForce3 Audio"
 0x10de	0x00da	"snd-intel8x0"	"nVidia Corp.|nForce2 Audio Codec Interface"
@@ -2963,7 +2963,7 @@
 0x10de	0x01b8	"unknown"	"nVidia Corp.|nForce PCI Bridge"
 0x10de	0x01bc	"amd74xx"	"nVidia Corp.|nForce ATA Controller"
 0x10de	0x01c1	"slamr"	"nVidia Corp.|Intel 537 [nForce MC97 Modem]"
-0x10de	0x01c2	"usb-ohci"	"nVidia Corp.|nForce USB Controller"
+0x10de	0x01c2	"ohci-hcd"	"nVidia Corp.|nForce USB Controller"
 0x10de	0x01c3	"forcedeth"	"nVidia Corp.|nForce MCP Networking Adapter"
 0x10de	0x01d1	"Card:NVIDIA GeForce 7 Series"	"nVidia Corp.|GeForce 7300 LE"
 0x10de	0x01d7	"Card:NVIDIA GeForce 7 Series"	"nVidia Corp.|Quadro NVS 110M / GeForce Go 7300"
@@ -4043,14 +4043,14 @@
 0x1145	0xf021	"delkin_cb"	"Workbit Corp.|"
 0x1148	0x4000	"skfp"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
 0x1148	0x4200	"tmspci"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
-0x1148	0x4300	"sk98lin"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
-0x1148	0x4320	"sk98lin"	"Syskonnect (Schneider & Koch)|SK-98xx Gigabit Ethernet Server Adapter"
+0x1148	0x4300	"skge"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
+0x1148	0x4320	"skge"	"Syskonnect (Schneider & Koch)|SK-98xx Gigabit Ethernet Server Adapter"
 0x1148	0x4400	"tg3"	"Syskonnect (Schneider & Koch)|Tigon3 Gigabit Ethernet"
 0x1148	0x4500	"tg3"	"Syskonnect (Schneider & Koch)|Tigon3 Gigabit Ethernet"
 0x1148	0x5579	"unknown"	"VMIC|VMIPCI-5579 (Reflective Memory Card)"
-0x1148	0x9000	"sk98lin"	"SysKonnect|SK-9Sxx Gigabit Ethernet Server Adapter PCI-X"
+0x1148	0x9000	"sky2"	"SysKonnect|SK-9Sxx Gigabit Ethernet Server Adapter PCI-X"
 0x1148	0x9843	"unknown"	"SysKonnect|[Fujitsu] Gigabit Ethernet"
-0x1148	0x9e00	"sk98lin"	"SysKonnect|SK-9Exx 10/100/1000Base-T Adapter"
+0x1148	0x9e00	"sky2"	"SysKonnect|SK-9Exx 10/100/1000Base-T Adapter"
 0x114a	0x5579	"unknown"	"VMIC|VMIPCI-5579 (Reflective Memory Card)"
 0x114a	0x5587	"unknown"	"VMIC|VMIPCI-5587 (Reflective Memory Card)"
 0x114a	0x5588	"unknown"	"VMIC|VMICPCI5588 VMICPCI5588 Reflective Memory Card"
@@ -4161,8 +4161,8 @@
 0x1166	0x0213	"serverworks"	"ServerWorks|CSB6 RAID/IDE Controller"
 0x1166	0x0214	"serverworks"	"Broadcom|HT1000 Legacy IDE controller"
 0x1166	0x0217	"serverworks"	"Reliance Computer Corp./ServerWorks|OSB6 PCI EIDE Controller (Tertiary)"
-0x1166	0x0220	"usb-ohci"	"Reliance Computer|OSB4 OpenHCI Compliant USB Controller"
-0x1166	0x0221	"usb-ohci"	"ServerWorks|CSB6 OHCI USB Controller"
+0x1166	0x0220	"ohci-hcd"	"Reliance Computer|OSB4 OpenHCI Compliant USB Controller"
+0x1166	0x0221	"ohci-hcd"	"ServerWorks|CSB6 OHCI USB Controller"
 0x1166	0x0223	"unknown"	"Broadcom|HT1000 USB Controller"
 0x1166	0x0225	"unknown"	"ServerWorks|GCLE Host Bridge"
 0x1166	0x0227	"tpm_atmel"	"ServerWorks|GCLE-2 Host Bridge"
@@ -4260,9 +4260,9 @@
 0x1186	0x4000	"dl2k"	"D-Link System Inc.| Ethernet Adapter"
 0x1186	0x4001	"unknown"	"D-Link System Inc.|DFE-650TX D Link Fast Ethernet PCMCIA Card"
 0x1186	0x4300	"r8169"	"D-Link System Inc.|DGE-528T Gigabit Ethernet Adapter"
-0x1186	0x4b00	"sk98lin"	"D-Link System Inc.|Gigabit Ethernet Adapter"
-0x1186	0x4b01	"sk98lin"	"D-Link System Inc.|Gigabit Ethernet Adapter"
-0x1186	0x4c00	"sk98lin"	"D-Link System Inc.|Gigabit Ethernet Adapter"
+0x1186	0x4b00	"sky2"	"D-Link System Inc.|Gigabit Ethernet Adapter"
+0x1186	0x4b01	"sky2"	"D-Link System Inc.|Gigabit Ethernet Adapter"
+0x1186	0x4c00	"skge"	"D-Link System Inc.|Gigabit Ethernet Adapter"
 0x1186	0x8400	"unknown"	"D-Link System Inc.|D-Link DWL-650+ CardBus PC Card"
 0x1189	0x1592	"unknown"	"Matsushita Electronics Co|VL/PCI Bridge"
 0x118c	0x0014	"unknown"	"Corollary Inc.|PCIB [C-bus II to PCI bus host bridge chip]"
@@ -4333,27 +4333,27 @@
 0x11ab	0x1fa6	"unknown"	"Marvell Semiconductor Inc.|Marvell W8300 802.11 Adapter"
 0x11ab	0x1fa7	"unknown"	"Marvell Semiconductor Inc.|88W8310 and 88W8000G [Libertas] 802.11g client chipset"
 0x11ab	0x1faa	"unknown"	"Marvell Semiconductor Inc.|88w8335 [Libertas] 802.11b/g Wireless"
-0x11ab	0x4320	"sk98lin"	"Marvell Semiconductor Inc.|88E8001 Gigabit Lan PCI Controller"
-0x11ab	0x4340	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4341	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4342	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4343	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4344	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4345	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4346	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4347	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
-0x11ab	0x4350	"sk98lin"	"Marvell Semiconductor Inc.|Fast Ethernet Controller"
-0x11ab	0x4351	"sk98lin"	"Marvell Semiconductor Inc.|Fast Ethernet Controller"
+0x11ab	0x4320	"skge"	"Marvell Semiconductor Inc.|88E8001 Gigabit Lan PCI Controller"
+0x11ab	0x4340	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4341	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4342	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4343	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4344	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4345	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4346	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4347	"sky2"	"Marvell Semiconductor Inc.|Gigabit Lan PCI Controller"
+0x11ab	0x4350	"sky2"	"Marvell Semiconductor Inc.|Fast Ethernet Controller"
+0x11ab	0x4351	"sky2"	"Marvell Semiconductor Inc.|Fast Ethernet Controller"
 0x11ab	0x4352	"sky2"	"Marvell Technology Group Ltd.|88E8038 PCI-E Fast Ethernet Controller"
-0x11ab	0x4360	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Ethernet Controller"
-0x11ab	0x4361	"sk98lin"	"Marvell Semiconductor Inc.|Gigabit Ethernet Controller"
-0x11ab	0x4362	"sk98lin"	"Marvell Semiconductor Inc.|Marvell Yukon 88E8053 Gigabit Ethernet 10/100/1000Base-T Adapter"
+0x11ab	0x4360	"sky2"	"Marvell Semiconductor Inc.|Gigabit Ethernet Controller"
+0x11ab	0x4361	"sky2"	"Marvell Semiconductor Inc.|Gigabit Ethernet Controller"
+0x11ab	0x4362	"sky2"	"Marvell Semiconductor Inc.|Marvell Yukon 88E8053 Gigabit Ethernet 10/100/1000Base-T Adapter"
 0x11ab	0x4363	"sky2"	"Marvell Technology Group Ltd.|88E8055 PCI-E Gigabit Ethernet Controller"
 0x11ab	0x4611	"unknown"	"Galileo Technology Ltd.|GT-64115 System Controller"
 0x11ab	0x4620	"unknown"	"Galileo Technology Ltd.|GT-64120 System Controller for R5K &amp; R7K w/64bit PCI"
 0x11ab	0x4801	"unknown"	"Galileo Technology Ltd.|GT-48001"
 0x11ab	0x4809	"unknown"	"Galileo Technology Ltd.|EV-48300 Evaluation board for the GT-48300"
-0x11ab	0x5005	"sk98lin"	"Marvell Semiconductor Inc.|Belkin F5D5005 Gigabit Desktop Network PCI Card"
+0x11ab	0x5005	"skge"	"Marvell Semiconductor Inc.|Belkin F5D5005 Gigabit Desktop Network PCI Card"
 0x11ab	0x5040	"sata_mv"	"Marvell Semiconductor Inc.|MV88SX5040 4-port SATA I PCI-X Controller"
 0x11ab	0x5041	"sata_mv"	"Marvell Semiconductor Inc.|MV88SX5041 4-port SATA I PCI-X Controller"
 0x11ab	0x5080	"sata_mv"	"Marvell Semiconductor Inc.|RocketRAID 182x SATA Controller"
@@ -4450,7 +4450,7 @@
 0x11c1	0x048c	"unknown"	"Agere Systems|SV92P SV92P PCI Soft Modem Chip Set"
 0x11c1	0x048f	"unknown"	"Agere Systems|SV92P-T00"
 0x11c1	0x0540	"unknown"	"Agere Systems| "
-0x11c1	0x5801	"usb-ohci"	"AT&T Microelectronics (Lucent)|USB Open Host Controller"
+0x11c1	0x5801	"ohci-hcd"	"AT&T Microelectronics (Lucent)|USB Open Host Controller"
 0x11c1	0x5802	"unknown"	"Agere Systems|USS-312 2-port PCI-to-USB OpenHCI Host Ctrlr"
 0x11c1	0x5803	"unknown"	"Agere Systems|USS-344 QuadraBus 4-port USB OpenHCI Host Ctrlr"
 0x11c1	0x5805	"unknown"	"Agere Systems|USB Advanced Host Controller"
@@ -5114,7 +5114,7 @@
 0x1360	0x0302	"unknown"	"Meinberg Funkuhren|TCR167PCI IRIG Timecode Reader"
 0x1365	0x9050	"ISDN:hysdn"	"Hypercope Corp.|HYSDN"
 0x136b	0xff01	"meye"	"Kawasaki Steel Corp.|MEYE Video Adapter"
-0x1371	0x434e	"sk98lin"	"CNet Technology Inc.|GigaCard Network Adapter"
+0x1371	0x434e	"skge"	"CNet Technology Inc.|GigaCard Network Adapter"
 0x1374	0x0024	"unknown"	"Silicom Ltd.|Silicom Dual port Giga Ethernet BGE Bypass Server Adapter"
 0x1374	0x0025	"unknown"	"Silicom Ltd.|Silicom Quad port Giga Ethernet BGE Bypass Server Adapter"
 0x1374	0x0026	"unknown"	"Silicom Ltd.|Silicom Dual port Fiber Giga Ethernet 546 Bypass Server Adapter"
@@ -5961,12 +5961,12 @@
 0x1734	0x1078	"unknown"	"Fujitsu Siemens Computer GmbH|Amilo Pro v2010"
 0x1737	0x0013	"unknown"	"Linksys|WMP54G Wireless Pci Card"
 0x1737	0x0015	"unknown"	"Linksys|WMP54GS Wireless Pci Card"
-0x1737	0x1032	0x1737	0x0015	"sk98lin"	"Linksys|EG1032 v2 Instant Gigabit Network Adapter"
-0x1737	0x1032	0x1737	0x0024	"sk98lin"	"Linksys|EG1032 v3 Instant Gigabit Network Adapter"
+0x1737	0x1032	0x1737	0x0015	"unknown"	"Linksys|EG1032 v2 Instant Gigabit Network Adapter"
+0x1737	0x1032	0x1737	0x0024	"unknown"	"Linksys|EG1032 v3 Instant Gigabit Network Adapter"
 0x1737	0x1032	0xffff	0x0015	"skge"	""
 0x1737	0x1032	0xffff	0x0024	"r8169"	""
-0x1737	0x1032	"sk98lin"	"Linksys|EG1032 Gigabit Network Adapter"
-0x1737	0x1064	"sk98lin"	"Linksys|Gigabit Network Adapter"
+0x1737	0x1032	"unknown"	"Linksys|EG1032 Gigabit Network Adapter"
+0x1737	0x1064	"skge"	"Linksys|Gigabit Network Adapter"
 0x1737	0xab08	"tulip"	"Linksys|21x4x DEC-Tulip compatible 10/100 Ethernet"
 0x1737	0xab09	"tulip"	"Linksys|21x4x DEC-Tulip compatible 10/100 Ethernet"
 0x173b	0x03e8	"tg3"	"Altima|AC1000 Gigabit Ethernet"
@@ -6838,7 +6838,7 @@
 0x8086	0x2421	"piix"	"Intel Corp.|82801AB 810 Chipset IDE Controller"
 0x8086	0x2422	"usb-uhci"	"Intel Corp.|82801AB 810 Chipset USB Controller"
 0x8086	0x2423	"i2c-i801"	"Intel Corp.|82801AB 810 Chipset SMBus Controller"
-0x8086	0x2425	"i810_audio"	"Intel Corp.|82901 810 Chipset AC'97 Audio Controller"
+0x8086	0x2425	"snd-intel8x0"	"Intel Corp.|82901 810 Chipset AC'97 Audio Controller"
 0x8086	0x2426	"slamr"	"Intel Corp.|82801AB 810 Chipset AC'97 PCI Modem"
 0x8086	0x2428	"hw_random"	"Intel Corp.|82801AB 810 Chipset Hub to PCI Bridge"
 0x8086	0x2430	"i810_rng"	"Intel Corp.|82801AB PCI Bridge"
@@ -6848,7 +6848,7 @@
 0x8086	0x2442	"usb-uhci"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub A)"
 0x8086	0x2443	"i2c-i801"	"Intel Corp.|82820 815e (Camino 2) Chipset SMBus"
 0x8086	0x2444	"usb-uhci"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub B)"
-0x8086	0x2445	"i810_audio"	"Intel Corp.|ICH2 810 Chipset AC'97 Audio Controller"
+0x8086	0x2445	"snd-intel8x0"	"Intel Corp.|ICH2 810 Chipset AC'97 Audio Controller"
 0x8086	0x2446	"snd-intel8x0m"	"Intel Corp.|82820 820 (Camino 2) Chipset AC'97 Modem Controller"
 0x8086	0x2448	"hw_random"	"Intel Corp.|82801 Hub Interface to PCI Bridge"
 0x8086	0x2449	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
@@ -6868,7 +6868,7 @@
 0x8086	0x2482	"usb-uhci"	"Intel Corp.|82801 USB Controller"
 0x8086	0x2483	"i2c-i801"	"Intel Corp.|82801 SMBus Controller"
 0x8086	0x2484	"usb-uhci"	"Intel Corp.|82801 USB Controller"
-0x8086	0x2485	"i810_audio"	"Intel Corp.|82801 AC97 Audio Controller"
+0x8086	0x2485	"snd-intel8x0"	"Intel Corp.|82801 AC97 Audio Controller"
 0x8086	0x2486	"slamr"	"Intel Corp.|PCTEL 2304 WT V.92 MDC Modem"
 0x8086	0x2487	"usb-uhci"	"Intel Corp.|82801 USB Controller"
 0x8086	0x248a	"piix"	"Intel Corp.|82801 UltraATA IDE Controller"
@@ -6973,7 +6973,7 @@
 0x8086	0x25a2	"ata_piix"	"Intel Corp.|Enterprise Southbridge PATA"
 0x8086	0x25a3	"ata_piix"	"Intel Corp.|IDE (SATA)"
 0x8086	0x25a4	"i2c-i801"	"Intel Corp.|Enterprise Southbridge SMBUS"
-0x8086	0x25a6	"i810_audio"	"Intel Corp.|Enterprise Southbridge AC'97 Audio"
+0x8086	0x25a6	"snd-intel8x0"	"Intel Corp.|Enterprise Southbridge AC'97 Audio"
 0x8086	0x25a7	"unknown"	"Intel Corp.|Enterprise Southbridge AC'97 Modem"
 0x8086	0x25a9	"usb-uhci"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
 0x8086	0x25aa	"usb-uhci"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
@@ -7274,7 +7274,7 @@
 0x8086	0x7191	"agpgart"	"Intel Corp.|440BX/ZX - 82443BX/ZX AGP bridge"
 0x8086	0x7192	"unknown"	"Intel Corp.|440BX/ZX - 82443BX/ZX Host bridge (AGP disabled)"
 0x8086	0x7194	"unknown"	"Intel Corp.|82440MX CPU to I/O Controller"
-0x8086	0x7195	"i810_audio"	"Intel Corp.|440MX 810 Chipset AC'97 Audio Controller"
+0x8086	0x7195	"snd-intel8x0"	"Intel Corp.|440MX 810 Chipset AC'97 Audio Controller"
 0x8086	0x7196	"slamr"	"Intel Corp.|82440 - 443MX AC97 Modem Controller (Winmodem)"
 0x8086	0x7198	"unknown"	"Intel Corp.|82440MX PCI to ISA Bridge"
 0x8086	0x7199	"piix"	"Intel Corp.|82440MX EIDE Controller"
@@ -7290,7 +7290,7 @@
 0x8086	0x7605	"unknown"	"Intel Corp.|82372FB IEEE1394 OpenHCI Host Controller"
 0x8086	0x7800	"Card:Intel 740 (generic)"	"Intel Corp.|i740"
 0x8086	0x844e	"unknown"	"Intel Corp.|82820 820 (Camino 2) Chipset PCI"
-0x8086	0x8485	"i810_audio"	"Intel Corp.|AC'97 Audio"
+0x8086	0x8485	"snd-intel8x0"	"Intel Corp.|AC'97 Audio"
 0x8086	0x84c4	"unknown"	"Intel Corp.|450KX/GX [Orion] - 82454KX/GX PCI bridge"
 0x8086	0x84c5	"unknown"	"Intel Corp.|450KX/GX [Orion] - 82453KX/GX Memory controller"
 0x8086	0x84ca	"piix"	"Intel Corp.|450NX - 82451NX Memory & I/O Controller"