do not use anymore kernel-2.4.x module names since we cannot rely on

/lib/module-init-tools/modprobe.compat at install time and we do not support
anymore kernel-2.4.x (because it results in bugs like #8814)

1 files changed, 64 insertions, 64 deletions

diff --git a/lst/pcitable b/lst/pcitable
index 9fbb4f78..19f74751 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -123,12 +123,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"
@@ -1058,23 +1058,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	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"
@@ -1082,10 +1082,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"
@@ -1416,7 +1416,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]"
@@ -1558,7 +1558,7 @@
 0x1039	0x6350	"unknown"	"Silicon Integrated Systems [SiS]|770/670 PCIE VGA Display Adapter"
 0x1039	0x6351	"unknown"	"Silicon Integrated Systems [SiS]|771/671 PCIE VGA Display Adapter"
 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"
@@ -1668,7 +1668,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]"
@@ -1685,7 +1685,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"
@@ -1864,7 +1864,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]"
@@ -2054,7 +2054,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"
@@ -2062,7 +2062,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"
@@ -2078,8 +2078,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"
@@ -2231,7 +2231,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"
@@ -2335,8 +2335,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"
@@ -2669,7 +2669,7 @@
 0x10b9	0x0000	"unknown"	"Acer Labs Inc.|MDV92XP NetoDragon PCI Soft Modem V92 NetoDragon"
 0x10b9	0x0101	"unknown"	"Acer Labs Inc.|CMI8338/C3DX PCI Audio Device"
 0x10b9	0x0111	"snd-cmipci"	"Acer Labs Inc.|C-Media CMI8738/C3DX Audio Device (OEM)"
-0x10b9	0x05ff	"alim1535d_wdt"	"Acer Labs Inc.|"
+0x10b9	0x05ff	"alim1535_wdt"	"Acer Labs Inc.|"
 0x10b9	0x0780	"unknown"	"Acer Labs Inc.|Multi-IO Card"
 0x10b9	0x0782	"unknown"	"Acer Labs Inc.|Multi-IO Card"
 0x10b9	0x1435	"unknown"	"Acer Labs Inc.|M1435"
@@ -2725,7 +2725,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"
@@ -2903,7 +2903,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"
@@ -2946,7 +2946,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"
@@ -3065,7 +3065,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	0x01d6	"unknown"	"nVidia Corporation|GeForce Go 7200"
@@ -3704,7 +3704,7 @@
 0x1106	0x287d	"unknown"	"VIA Technologies Inc.|VT8251 PCIE Root Port"
 0x1106	0x287e	"unknown"	"VIA Technologies Inc.|VT8251 Ultra VLINK Controller"
 0x1106	0x3022	"Card:S3 UniChrome"	"VIA Technologies Inc.|CLE266"
-0x1106	0x3038	"usb-uhci"	"VIA Technologies Inc.|VT82C586B USB"
+0x1106	0x3038	"uhci-hcd"	"VIA Technologies Inc.|VT82C586B USB"
 0x1106	0x3040	"i2c-via"	"VIA Technologies Inc.|VT82C586B ACPI"
 0x1106	0x3043	"via-rhine"	"VIA Technologies Inc.|VT86C100A [Rhine 10/100]"
 0x1106	0x3044	"ohci1394"	"VIA Technologies Inc.|OHCI Compliant IEEE 1394 Host Controller"
@@ -4358,8 +4358,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"
@@ -4650,7 +4650,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"
@@ -7109,59 +7109,59 @@
 0x8086	0x2125	"unknown"	"Intel Corp.|82801AB AC97 Audio Controller"
 0x8086	0x2240	"unknown"	"Intel Corp.|82815 815 Chipset ISA Bridge"
 0x8086	0x224e	"unknown"	"Intel Corp.|82815 815 Chipset PCI Bridge"
-0x8086	0x2410	"i810-tco"	"Intel Corp.|82801AA 810 Chipset LPC Interface Bridge"
+0x8086	0x2410	"i8xx_tco"	"Intel Corp.|82801AA 810 Chipset LPC Interface Bridge"
 0x8086	0x2411	"piix"	"Intel Corp.|82801AA 810 Chipset IDE Controller"
-0x8086	0x2412	"usb-uhci"	"Intel Corp.|82801AA 810 Chipset USB Controller"
+0x8086	0x2412	"uhci-hcd"	"Intel Corp.|82801AA 810 Chipset USB Controller"
 0x8086	0x2413	"i2c-i801"	"Intel Corp.|82801AA 810 Chipset SMBus Controller"
 0x8086	0x2415	"snd-intel8x0"	"Intel Corp.|82801AA 810 Chipset AC'97 Audio Controller"
 0x8086	0x2416	"slamr"	"Intel Corp.|82801AA 810 Chipset AC'97 PCI Modem"
 0x8086	0x2418	"hw_random"	"Intel Corp.|82801AA 810 Chipset Hub to PCI Bridge"
-0x8086	0x2420	"i810-tco"	"Intel Corp.|82801AB 810 Chipset LPC Interface Bridge"
+0x8086	0x2420	"i8xx_tco"	"Intel Corp.|82801AB 810 Chipset LPC Interface Bridge"
 0x8086	0x2421	"piix"	"Intel Corp.|82801AB 810 Chipset IDE Controller"
-0x8086	0x2422	"usb-uhci"	"Intel Corp.|82801AB 810 Chipset USB Controller"
+0x8086	0x2422	"uhci-hcd"	"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	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	"hw_random"	"Intel Corp.|82801AB PCI Bridge"
 0x8086	0x2431	"unknown"	"Intel Corp.|82810 pci bus"
-0x8086	0x2440	"i810-tco"	"Intel Corp.|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
+0x8086	0x2440	"i8xx_tco"	"Intel Corp.|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
 0x8086	0x2441	"unknown"	"Intel Corp.|82801BA IDE Controller (UltraATA/66)"
-0x8086	0x2442	"usb-uhci"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub A)"
+0x8086	0x2442	"uhci-hcd"	"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	0x2444	"uhci-hcd"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub B)"
 0x8086	0x2445	"i810_audio"	"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"
 0x8086	0x244a	"piix"	"Intel Corp.|82820 820 (Camino 2) Chipset IDE U100 (-M)"
 0x8086	0x244b	"piix"	"Intel Corp.|82820 815e (Camino 2) Chipset IDE U100"
-0x8086	0x244c	"i810-tco"	"Intel Corp.|82801BAM LPC Interface Bridge"
+0x8086	0x244c	"i8xx_tco"	"Intel Corp.|82801BAM LPC Interface Bridge"
 0x8086	0x244e	"hw_random"	"Intel Corp.|82820 815e (Camino 2) Chipset PCI"
-0x8086	0x2450	"i810-tco"	"Intel Corp.|82801E ISA Bridge (LPC)"
+0x8086	0x2450	"i8xx_tco"	"Intel Corp.|82801E ISA Bridge (LPC)"
 0x8086	0x2452	"unknown"	"Intel Corp.|82801E USB"
 0x8086	0x2453	"unknown"	"Intel Corp.|82801E SMBus"
 0x8086	0x2459	"eepro100"	"Intel Corp.|82801E Ethernet Controller 0"
 0x8086	0x245b	"piix"	"Intel Corp.|82801E IDE U100"
 0x8086	0x245d	"eepro100"	"Intel Corp.|82801E Ethernet Controller 1"
 0x8086	0x245e	"hw_random"	"Intel Corp.|82801E PCI Bridge"
-0x8086	0x2480	"i810-tco"	"Intel Corp.|82801CA LPC Interface"
+0x8086	0x2480	"i8xx_tco"	"Intel Corp.|82801CA LPC Interface"
 0x8086	0x2481	"unknown"	"Intel Corp.|82801CA IDE Controller (UltraATA/66)"
-0x8086	0x2482	"usb-uhci"	"Intel Corp.|82801 USB Controller"
+0x8086	0x2482	"uhci-hcd"	"Intel Corp.|82801 USB Controller"
 0x8086	0x2483	"i2c-i801"	"Intel Corp.|82801 SMBus Controller"
-0x8086	0x2484	"usb-uhci"	"Intel Corp.|82801 USB Controller"
+0x8086	0x2484	"uhci-hcd"	"Intel Corp.|82801 USB Controller"
 0x8086	0x2485	"i810_audio"	"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	0x2487	"uhci-hcd"	"Intel Corp.|82801 USB Controller"
 0x8086	0x248a	"piix"	"Intel Corp.|82801 UltraATA IDE Controller"
 0x8086	0x248b	"piix"	"Intel Corp.|82801CA/CAM UltraATA IDE Controller"
-0x8086	0x248c	"i810-tco"	"Intel Corp.|82801 LPC Interface"
+0x8086	0x248c	"i8xx_tco"	"Intel Corp.|82801 LPC Interface"
 0x8086	0x248d	"unknown"	"Intel Corp.|82801?? USB 2.0 EHCI Contoroller"
-0x8086	0x24c0	"i810-tco"	"Intel Corp.|82801DB 845G/GL Chipset ISA Bridge (ICH4)"
+0x8086	0x24c0	"i8xx_tco"	"Intel Corp.|82801DB 845G/GL Chipset ISA Bridge (ICH4)"
 0x8086	0x24c1	"piix"	"Intel Corp.|82801DBL (ICH4-L) IDE Controller"
-0x8086	0x24c2	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24c2	"uhci-hcd"	"Intel Corp.|82801DB USB Controller"
 0x8086	0x24c3	"i2c-i801"	"Intel Corp.|82801DB SMBus Controller"
-0x8086	0x24c4	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24c4	"uhci-hcd"	"Intel Corp.|82801DB USB Controller"
 0x8086	0x24c5	"snd-intel8x0"	"Intel Corp.|ICH4 845G/GL Chipset AC'97 Audio Controller"
 0x8086	0x24c6	0x003c	0x1025	"snd-intel8x0m"	"Intel Corporation|Acer Aspire 2001WLCi (Compal CL50 motherboard) implementation"
 0x8086	0x24c6	0x1014	0x0525	"slamr"	"Intel Corp.|82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller"
@@ -7178,23 +7178,23 @@
 0x8086	0x24c6	0x14c0	0x0012	"slamr"	"Intel Corp.|82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller"
 0x8086	0x24c6	0x17c0	0x1069	"slamr"	"Intel Corp.|82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller"
 0x8086	0x24c6	"snd-intel8x0m"	"Intel Corp.|82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller"
-0x8086	0x24c7	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24c7	"uhci-hcd"	"Intel Corp.|82801DB USB Controller"
 0x8086	0x24ca	"piix"	"Intel Corp.|82801DBM IDE Controller (UltraATA/100)"
 0x8086	0x24cb	"piix"	"Intel Corp.|82801DB 845G/GL Chipset IDE Controller"
-0x8086	0x24cc	"i810-tco"	"Intel Corp.|82801DBM LPC Interface Bridge"
+0x8086	0x24cc	"i8xx_tco"	"Intel Corp.|82801DBM LPC Interface Bridge"
 0x8086	0x24cd	"ehci-hcd"	"Intel Corp.|82801DB USB Enhanced Controller"
-0x8086	0x24d0	"i810-tco"	"Intel Corp.|82801EB ISA Bridge (LPC)"
+0x8086	0x24d0	"i8xx_tco"	"Intel Corp.|82801EB ISA Bridge (LPC)"
 0x8086	0x24d1	"ata_piix"	"Intel Corp.|82801EB ICH5 IDE (SATA)"
-0x8086	0x24d2	"usb-uhci"	"Intel Corp.|USB Controller"
+0x8086	0x24d2	"uhci-hcd"	"Intel Corp.|USB Controller"
 0x8086	0x24d3	"i2c-i801"	"Intel Corp.|82801EB SMBus"
-0x8086	0x24d4	"usb-uhci"	"Intel Corp.|USB Controller"
+0x8086	0x24d4	"uhci-hcd"	"Intel Corp.|USB Controller"
 0x8086	0x24d5	"snd-intel8x0"	"Intel Corp.|82801EB AC'97 Audio"
 0x8086	0x24d6	"slamr"	"Intel Corp.|82801EB AC'97 Modem Controller"
-0x8086	0x24d7	"usb-uhci"	"Intel Corp.|USB Controller"
+0x8086	0x24d7	"uhci-hcd"	"Intel Corp.|USB Controller"
 0x8086	0x24db	"ata_piix"	"Intel Corp.|82801EB ICH5 IDE"
 0x8086	0x24dc	"unknown"	"Intel Corp.|82801EB LPC Interface Controller"
 0x8086	0x24dd	"ehci-hcd"	"Intel Corp.|USB Enhanced Controller"
-0x8086	0x24de	"usb-uhci"	"Intel Corp.|82801EB USB EHCI Controller #2"
+0x8086	0x24de	"uhci-hcd"	"Intel Corp.|82801EB USB EHCI Controller #2"
 0x8086	0x24df	"ata_piix"	"Intel Corp.|82801ER ICH5 IDE (SATA Raid)"
 0x8086	0x2500	"intel-agp"	"Intel Corp.|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2501	"intel-agp"	"Intel Corp.|82820 820 (Camino) Chipset Host Bridge (MCH)"
@@ -7259,8 +7259,8 @@
 0x8086	0x25a4	"i2c-i801"	"Intel Corp.|Enterprise Southbridge SMBUS"
 0x8086	0x25a6	"i810_audio"	"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"
+0x8086	0x25a9	"uhci-hcd"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
+0x8086	0x25aa	"uhci-hcd"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
 0x8086	0x25ab	"i6300esb"	"Intel Corp.|Enterprise Southbridge Watchdog Timer"
 0x8086	0x25ac	"unknown"	"Intel Corp.|Enterprise Southbridge IOxAPIC"
 0x8086	0x25ad	"ehci-hcd"	"Intel Corp.|Enterprise Southbridge USB 2.0 EHCI"
@@ -7320,9 +7320,9 @@
 0x8086	0x2625	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
 0x8086	0x2626	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
 0x8086	0x2627	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
-0x8086	0x2640	"i810-tco"	"Intel Corp.|I/O Controller Hub LPC"
-0x8086	0x2641	"i810-tco"	"Intel Corp.|I/O Controller Hub LPC"
-0x8086	0x2642	"i810-tco"	"Intel Corp.|I/O Controller Hub LPC"
+0x8086	0x2640	"i8xx_tco"	"Intel Corp.|I/O Controller Hub LPC"
+0x8086	0x2641	"i8xx_tco"	"Intel Corp.|I/O Controller Hub LPC"
+0x8086	0x2642	"i8xx_tco"	"Intel Corp.|I/O Controller Hub LPC"
 0x8086	0x2651	"ata_piix"	"Intel Corp.|82801FB/FW (ICH6/ICH6W) SATA Controller"
 0x8086	0x2652	"ahci"	"Intel Corp.|82801FR/FRW (ICH6R/ICH6RW) SATA Controller"
 0x8086	0x2653	0x1028	0x0186	"ata_piix"	"Intel Corp.|82801FR/FRW (ICH6R/ICH6RW) SATA Controller"
@@ -7387,8 +7387,8 @@
 0x8086	0x27a2	"Card:Intel 945"	"Intel Corp.|Mobile Integrated Graphics Controller"
 0x8086	0x27a6	"unknown"	"Intel Corp.|Mobile Integrated Graphics Controller"
 0x8086	0x27b0	"unknown"	"Intel Corp.|I/O Controller Hub LPC"
-0x8086	0x27b1	"i810-tco"	"Intel Corp.|Mobile I/O Controller Hub LPC"
-0x8086	0x27b8	"i810-tco"	"Intel Corp.|I/O Controller Hub LPC"
+0x8086	0x27b1	"i8xx_tco"	"Intel Corp.|Mobile I/O Controller Hub LPC"
+0x8086	0x27b8	"i8xx_tco"	"Intel Corp.|I/O Controller Hub LPC"
 0x8086	0x27b9	"i8xx_tco"	"Intel Corp.|Mobile I/O Controller Hub LPC"
 0x8086	0x27bd	"unknown"	"Intel Corp.|Mobile I/O Controller Hub LPC"
 0x8086	0x27c0	"ata_piix"	"Intel Corp.|I/O Controller Hub SATA cc=IDE"
@@ -7541,14 +7541,14 @@
 0x8086	0x6960	"unknown"	"Intel Corp.|EHCI 960 emulator"
 0x8086	0x7000	"unknown"	"Intel Corp.|82371SB PIIX3 ISA [Natoma/Triton II]"
 0x8086	0x7010	"piix"	"Intel Corp.|82371SB PIIX3 IDE [Natoma/Triton II]"
-0x8086	0x7020	"usb-uhci"	"Intel Corp.|82371SB PIIX3 USB [Natoma/Triton II]"
+0x8086	0x7020	"uhci-hcd"	"Intel Corp.|82371SB PIIX3 USB [Natoma/Triton II]"
 0x8086	0x7030	"unknown"	"Intel Corp.|430VX - 82437VX TVX [Triton VX]"
 0x8086	0x7050	"unknown"	"Intel Corp.|Intel Intercast Video Capture Card"
 0x8086	0x7051	"unknown"	"Intel Corp.|PB 642365-003 Intel Business Video Conferencing Card"
 0x8086	0x7100	"unknown"	"Intel Corp.|430TX - 82439TX MTXC"
 0x8086	0x7110	"unknown"	"Intel Corp.|82371AB PIIX4 ISA"
 0x8086	0x7111	"ata_piix"	"Intel Corp.|82371AB PIIX4 IDE"
-0x8086	0x7112	"usb-uhci"	"Intel Corp.|82371AB PIIX4 USB"
+0x8086	0x7112	"uhci-hcd"	"Intel Corp.|82371AB PIIX4 USB"
 0x8086	0x7113	"sonypi"	"Intel Corp.|82371AB PIIX4 ACPI - Bus Master IDE Controller"
 0x8086	0x7120	"intel-agp"	"Intel Corp.|82810 GMCH [Graphics Memory Controller Hub]"
 0x8086	0x7121	"Card:Intel 810"	"Intel Corp.|82810 CGC [Chipset Graphics Controller]"
@@ -7571,14 +7571,14 @@
 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"
-0x8086	0x719a	"usb-uhci"	"Intel Corp.|82440MX USB Universal Host Controller"
+0x8086	0x719a	"uhci-hcd"	"Intel Corp.|82440MX USB Universal Host Controller"
 0x8086	0x719b	"i2c-piix4"	"Intel Corp.|82440MX Power Management Controller"
 0x8086	0x71a0	"intel-agp"	"Intel Corp.|440GX - 82443GX Host bridge"
 0x8086	0x71a1	"unknown"	"Intel Corp.|440GX - 82443GX AGP bridge"
 0x8086	0x71a2	"unknown"	"Intel Corp.|440GX - 82443GX Host bridge (AGP disabled)"
 0x8086	0x7600	"unknown"	"Intel Corp.|82372FB PCI to ISA Bridge"
 0x8086	0x7601	"piix"	"Intel Corp.|82372FB PIIX4 IDE"
-0x8086	0x7602	"usb-uhci"	"Intel Corp.|82372FB [PCI-to-USB UHCI]"
+0x8086	0x7602	"uhci-hcd"	"Intel Corp.|82372FB [PCI-to-USB UHCI]"
 0x8086	0x7603	"unknown"	"Intel Corp.|82372FB System Management Bus Controller"
 0x8086	0x7605	"unknown"	"Intel Corp.|82372FB IEEE1394 OpenHCI Host Controller"
 0x8086	0x7800	"Card:Intel 740 (generic)"	"Intel Corp.|i740"