convert/add agpgart 2.4 style to agpgart 2.6 (intel-agp,ali-agp,...)

2 files changed, 95 insertions, 78 deletions

diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index f32d73ec..f7e9f411 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -65,6 +65,7 @@ fi
 
 %changelog
 - add 2 monitors (thanks to Frederik Himpe, bugzilla #6710)
+- convert agpgart 24 style to splitted agpgart module (intel-agp,...).
 
 * Fri Dec 12 2003 Pixel <pixel@mandrakesoft.com> 0.1.8-13mdk
 - use fbdev for some radeon's
diff --git a/lst/pcitable b/lst/pcitable
index d61eaa17..694679f3 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -302,12 +302,18 @@
 0x1002	0x5654	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT [Mach64 VT]"
 0x1002	0x5655	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT3 [Mach64 VT3]"
 0x1002	0x5656	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT4 [Mach64 VT4]"
+0x1002	0x5830	"ati-agp"	"ATI|CPU to PCI Bridge"
+0x1002	0x5831	"ati-agp"	"ATI|CPU to PCI Bridge"
+0x1002	0x5832	"ati-agp"	"ATI|CPU to PCI Bridge"
+0x1002	0x5833	"ati-agp"	"ATI|CPU to PCI Bridge"
 0x1002	0x5960	"Card:ATI Radeon (fglrx)"	""
 0x1002	0x5961	"Card:ATI Radeon (fbdev)"	"ATI Technologies Inc|Radeon RV280 [Radeon 9200]"
 0x1002	0x700f	"unknown"	"ATI Technologies Inc|U1/A3 AGP Bridge [IGP 320M]"
 0x1002	0x7010	"unknown"	"ATI|PCI Bridge [IGP 340M]"
-0x1002	0xcab0	"unknown"	"ATI Technologies|CPU to PCI Bridge"
-0x1002	0xcab2	"unknown"	"ATI|RS200/RS200M AGP Bridge [IGP 340M]"
+0x1002	0xcab0	"ati-agp"	"ATI Technologies|CPU to PCI Bridge"
+0x1002	0xcab2	"ati-agp"	"ATI|RS200/RS200M AGP Bridge [IGP 340M]"
+0x1002	0xcab3	"ati-agp"	"ATI|RS250/RS250M AGP Bridge"
+0x1002	0xcbb2	"ati-agp"	"ATI|CPU to PCI Bridge"
 0x1003	0x0201	"unknown"	"ULSI Systems|US201"
 0x1004	0x0005	"unknown"	"VLSI|82C592-FC1"
 0x1004	0x0006	"unknown"	"VLSI|82C593-FC1"
@@ -564,11 +570,11 @@
 0x1022	0x2040	"unknown"	"Advanced Micro Devices|79c974"
 0x1022	0x3000	"unknown"	"Advanced Micro Devices|ELanSC520 Microcontroller"
 0x1022	0x7004	"unknown"	"Advanced Micro Devices|AMD-751 CPU to PCI Bridge"
-0x1022	0x7006	"agpgart"	"Advanced Micro Devices|AMD-751 [Irongate] System Controller"
+0x1022	0x7006	"amd-k7-agp"	"Advanced Micro Devices|AMD-751 [Irongate] System Controller"
 0x1022	0x7007	"unknown"	"Advanced Micro Devices|AMD-751 PCI to PCI bridge"
-0x1022	0x700c	"unknown"	"Advanced Micro Devices|AMD-762 CPU to PCI Bridge (SMP chipset)"
+0x1022	0x700c	"amd-k7-agp"	"Advanced Micro Devices|AMD-762 CPU to PCI Bridge (SMP chipset)"
 0x1022	0x700d	"unknown"	"Advanced Micro Devices|AMD-762 CPU to PCI Bridge (AGP 4x)"
-0x1022	0x700e	"unknown"	"Advanced Micro Devices|AMD-761 North Bridge"
+0x1022	0x700e	"amd-k7-agp"	"Advanced Micro Devices|AMD-761 North Bridge"
 0x1022	0x700f	"unknown"	"Advanced Micro Devices|AMD-761 CPU to AGP Bridge  (AGP 4x)"
 0x1022	0x7400	"unknown"	"Advanced Micro Devices|AMD-755 PCI to ISA bridge"
 0x1022	0x7401	"unknown"	"Advanced Micro Devices|AMD-755 (Cobra) Bus Master IDE controller"
@@ -592,7 +598,7 @@
 0x1022	0x7449	"unknown"	"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	"unknown"	"Advanced Micro Devices|AMD-8151 System Controller"
+0x1022	0x7454	"amd64-agp"	"Advanced Micro Devices|AMD-8151 System Controller"
 0x1022	0x7455	"amd768_rng"	"Advanced Micro Devices|AMD-8151 AGP Bridge"
 0x1022	0x7460	"unknown"	"Advanced Micro Devices|AMD-8111 PCI"
 0x1022	0x7461	"usb-ohci"	"Advanced Micro Devices|AMD-8111 USB"
@@ -666,14 +672,18 @@
 0x1025	0x1531	"unknown"	"Acer Incorporated [ALI]|M1531"
 0x1025	0x1533	"unknown"	"Acer Incorporated [ALI]|M1533"
 0x1025	0x1535	"unknown"	"Acer Incorporated [ALI]|M1535 PCI Bridge + Super I/O + FIR"
-0x1025	0x1541	"agpgart"	"Acer Incorporated [ALI]|M1541 Northbridge [Aladdin V]"
+0x1025	0x1541	"ali-agp"	"Acer Incorporated [ALI]|M1541 Northbridge [Aladdin V]"
 0x1025	0x1542	"unknown"	"Acer Incorporated [ALI]|M1542 Northbridge [Aladdin V]"
 0x1025	0x1543	"unknown"	"Acer Incorporated [ALI]|M1543 PCI-to-ISA Bridge + Super I/O + FIR"
 0x1025	0x1561	"unknown"	"Acer Incorporated [ALI]|M1561 Northbridge [Aladdin 7]"
-0x1025	0x1621	"unknown"	"Acer Incorporated [ALI]|M1621 Northbridge [Aladdin-Pro II]"
-0x1025	0x1631	"unknown"	"Acer Incorporated [ALI]|M1631 Northbridge+3D Graphics [Aladdin TNT2]"
-0x1025	0x1641	"unknown"	"Acer Incorporated [ALI]|M1641 Northbridge [Aladdin-Pro IV]"
-0x1025	0x1647	"unknown"	"Acer Incorporated [ALI]|M1647 [MaGiK1] PCI North Bridge"
+0x1025	0x1621	"ali-agp"	"Acer Incorporated [ALI]|M1621 Northbridge [Aladdin-Pro II]"
+0x1025	0x1631	"ali-agp"	"Acer Incorporated [ALI]|M1631 Northbridge+3D Graphics [Aladdin TNT2]"
+0x1025	0x1632	"ali-agp"	"Acer Incorporated [ALI]|M1632 Northbridge+3D Graphics"
+0x1025	0x1641	"ali-agp"	"Acer Incorporated [ALI]|M1641 Northbridge [Aladdin-Pro IV]"
+0x1025	0x1644	"ali-agp"	"Acer Incorporated [ALI]|M1644 Northbridge"
+0x1025	0x1647	"ali-agp"	"Acer Incorporated [ALI]|M1647 [MaGiK1] PCI North Bridge"
+0x1025	0x1651	"ali-agp"	"Acer Incorporated [ALI]|M1651 PCI North Bridge"
+0x1025	0x1671	"ali-agp"	"Acer Incorporated [ALI]|M1671 PCI North Bridge"
 0x1025	0x3141	"unknown"	"Acer Incorporated [ALI]|M3141"
 0x1025	0x3143	"unknown"	"Acer Incorporated [ALI]|M3143"
 0x1025	0x3145	"unknown"	"Acer Incorporated [ALI]|M3145"
@@ -882,7 +892,7 @@
 0x1033	0x00f3	"unknown"	"NEC Corporation|uPD6113x Multimedia Decoder/Processor [EMMA2]"
 0x1036	0x0000	"fdomain"	"Future Domain|TMC-18C30 [36C70]"
 0x1039	0x0001	"unknown"	"Silicon Integrated Systems [SiS]|5591/5592 AGP"
-0x1039	0x0002	"unknown"	"Silicon Integrated Systems [SiS]|SG86C202"
+0x1039	0x0002	"sis-agp"	"Silicon Integrated Systems [SiS]|SG86C202"
 0x1039	0x0005	"unknown"	"Silicon Integrated Systems [SiS]|Pentium Chipset"
 0x1039	0x0006	"unknown"	"Silicon Integrated Systems [SiS]|85C501/2/3"
 0x1039	0x0008	"unknown"	"Silicon Integrated Systems [SiS]|85C503/5513"
@@ -901,32 +911,35 @@
 0x1039	0x0330	"unknown"	"Silicon Integrated System|SiS330 Xabre 2D/3D Accelerator"
 0x1039	0x0406	"unknown"	"Silicon Integrated Systems [SiS]|85C501/2"
 0x1039	0x0496	"unknown"	"Silicon Integrated Systems [SiS]|85C496"
-0x1039	0x0530	"agpgart"	"Silicon Integrated Systems [SiS]|530 Host"
-0x1039	0x0540	"agpgart"	"Silicon Integrated Systems [SiS]|540 Host"
-0x1039	0x0550	"unknown"	"Silicon Integrated System|SiS550/1/2 North Bridge"
+0x1039	0x0530	"sis-agp"	"Silicon Integrated Systems [SiS]|530 Host"
+0x1039	0x0540	"sis-agp"	"Silicon Integrated Systems [SiS]|540 Host"
+0x1039	0x0550	"sis-agp"	"Silicon Integrated System|SiS550/1/2 North Bridge"
 0x1039	0x0596	"unknown"	"Silicon Integrated Systems [SiS]|Pentium PCI Chipset with IDE"
 0x1039	0x0597	"unknown"	"Silicon Integrated Systems [SiS]|5513C"
 0x1039	0x0601	"unknown"	"Silicon Integrated Systems [SiS]|85C601"
-0x1039	0x0620	"agpgart"	"Silicon Integrated Systems [SiS]|620 Host"
-0x1039	0x0630	"agpgart"	"Silicon Integrated Systems [SiS]|630 Host"
+0x1039	0x0620	"sis-agp"	"Silicon Integrated Systems [SiS]|620 Host"
+0x1039	0x0630	"sis-agp"	"Silicon Integrated Systems [SiS]|630 Host"
 0x1039	0x0633	"unknown"	"Silicon Integrated Systems [SiS]|633 Host"
 0x1039	0x0635	"unknown"	"Silicon Integrated System|SiS 635 Host-to-PCI Bridge"
 0x1039	0x0640	"unknown"	"Silicon Integrated System|SiS 640 Host-to-PCI Bridge"
-0x1039	0x0645	"unknown"	"Silicon Integrated System|SiS 645 Host-to-PCI Bridge"
-0x1039	0x0646	"unknown"	"Silicon Integrated Systems [SiS]|645DX Host"
-0x1039	0x0648	"unknown"	"Silicon Integrated System|SiS648 Host-to-PCI Bridge"
+0x1039	0x0645	"sis-agp"	"Silicon Integrated System|SiS 645 Host-to-PCI Bridge"
+0x1039	0x0646	"sis-agp"	"Silicon Integrated Systems [SiS]|645DX Host"
+0x1039	0x0648	"sis-agp"	"Silicon Integrated System|SiS648 Host-to-PCI Bridge"
 0x1039	0x0649	"unknown"	"Silicon Integrated System|Host-to-PCI Bridge"
-0x1039	0x0650	"unknown"	"Silicon Integrated System|SiS 650 Host-to-PCI Bridge"
-0x1039	0x0651	"unknown"	"Silicon Integrated Systems [SiS]|SiS651 Host"
-0x1039	0x0655	"unknown"	"Silicon Integrated System|Host-to-PCI Bridge"
+0x1039	0x0650	"sis-agp"	"Silicon Integrated System|SiS 650 Host-to-PCI Bridge"
+0x1039	0x0651	"sis-agp"	"Silicon Integrated Systems [SiS]|SiS651 Host"
+0x1039	0x0655	"sis-agp"	"Silicon Integrated System|Host-to-PCI Bridge"
 0x1039	0x0660	"unknown"	"Silicon Integrated System|Host-to-PCI Bridge"
-0x1039	0x0730	"unknown"	"Silicon Integrated Systems [SiS]|730 Host"
+0x1039	0x0661	"sis-agp"	"Silicon Integrated System|Host-to-PCI Bridge"
+0x1039	0x0730	"sis-agp"	"Silicon Integrated Systems [SiS]|730 Host"
 0x1039	0x0733	"unknown"	"Silicon Integrated Systems [SiS]|733 Host"
-0x1039	0x0735	"unknown"	"Silicon Integrated Systems [SiS]|735 Host"
-0x1039	0x0740	"unknown"	"Silicon Integrated System|SiS 740 Host-to-PCI Bridge"
-0x1039	0x0745	"unknown"	"Silicon Integrated Systems [SiS]|745 Host"
-0x1039	0x0746	"unknown"	"Silicon Integrated System|SiS746 Host-to-PCI Bridge"
-0x1039	0x0755	"unknown"	"Silicon Integrated System|Host-to-PCI Bridge"
+0x1039	0x0735	"sis-agp"	"Silicon Integrated Systems [SiS]|735 Host"
+0x1039	0x0740	"sis-agp"	"Silicon Integrated System|SiS 740 Host-to-PCI Bridge"
+0x1039	0x0741	"sis-agp"	"Silicon Integrated Systems [SiS]|Host"
+0x1039	0x0745	"sis-agp"	"Silicon Integrated Systems [SiS]|745 Host"
+0x1039	0x0746	"sis-agp"	"Silicon Integrated System|SiS746 Host-to-PCI Bridge"
+0x1039	0x0755	"amd64-agp"	"Silicon Integrated System|Host-to-PCI Bridge"
+0x1039	0x0760	"sis-agp"	"Silicon Integrated System|Host-to-PCI Bridge"
 0x1039	0x0900	"sis900"	"Silicon Integrated Systems [SiS]|SiS900 10/100 Ethernet"
 0x1039	0x0961	"unknown"	"Silicon Integrated Systems [SiS]|SiS961 [MuTIOL Media IO]"
 0x1039	0x0962	"unknown"	"Silicon Integrated Systems [SiS]|SiS962 [MuTIOL Media IO]"
@@ -1288,23 +1301,23 @@
 0x106b	0x0019	"usb-ohci"	"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	"unknown"	"Apple Computer Inc.|Uni-North AGP Interface"
+0x106b	0x0020	"uninorth-agp"	"Apple Computer Inc.|Uni-North AGP Interface"
 0x106b	0x0021	"sungem"	"Apple Computer Inc.|UniNorth GMAC Ethernet controller"
 0x106b	0x0022	"unknown"	"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	"unknown"	"Apple Computer Inc.|KeyLargo/Pangea USB"
-0x106b	0x0027	"unknown"	"Apple Computer Inc.|Pangea AGP Interface"
+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"
-0x106b	0x002d	"unknown"	"Apple Computer Inc.|UniNorth 1.5 AGP"
+0x106b	0x002d	"uninorth-agp"	"Apple Computer Inc.|UniNorth 1.5 AGP"
 0x106b	0x002e	"unknown"	"Apple Computer Inc.|UniNorth 1.5 PCI"
 0x106b	0x002f	"unknown"	"Apple Computer Inc.|UniNorth 1.5 Internal PCI"
 0x106b	0x0030	"unknown"	"Apple Computer Inc.|UniNorth/Pangea FireWire"
 0x106b	0x0031	"unknown"	"Apple Computer Inc.|UniNorth 2 FireWire"
 0x106b	0x0032	"unknown"	"Apple Computer Inc.|UniNorth 2 GMAC (Sun GEM)"
 0x106b	0x0033	"unknown"	"Apple Computer Inc.|UniNorth 2 ATA/100"
-0x106b	0x0034	"unknown"	"Apple Computer Inc.|UniNorth 2 AGP"
+0x106b	0x0034	"uninorth-agp"	"Apple Computer Inc.|UniNorth 2 AGP"
 0x106b	0x1645	"unknown"	"Apple Computer Inc.|Tigon3 Gigabit Ethernet NIC (BCM5701)"
 0x106c	0x8801	"unknown"	"Hyundai Electronics America|Dual Pentium ISA/PCI Motherboard"
 0x106c	0x8802	"unknown"	"Hyundai Electronics America|PowerPC ISA/PCI Motherboard"
@@ -2109,10 +2122,12 @@
 0x1105	0x8475	"unknown"	"Sigma Designs Inc.|EM8475 MPEG-4 Decoder"
 0x1106	0x0102	"unknown"	"VIA Technologies, Inc.|Embedded VIA Ethernet Controller"
 0x1106	0x0130	"unknown"	"VIA Technologies Inc|VT6305 1394.A OHCI Link Layer Controller"
-0x1106	0x0198	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x0305	"unknown"	"VIA Technologies|VT8363/8365 [KT133/KM133]"
-0x1106	0x0391	"unknown"	"VIA Technologies|VT8371 [KX133]"
-0x1106	0x0501	"agpgart"	"VIA Technologies|VT8501"
+0x1106	0x0198	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x0204	"amd64-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x0259	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x0305	"via-agp"	"VIA Technologies|VT8363/8365 [KT133/KM133]"
+0x1106	0x0391	"via-agp"	"VIA Technologies|VT8371 [KX133]"
+0x1106	0x0501	"via-agp"	"VIA Technologies|VT8501"
 0x1106	0x0505	"unknown"	"VIA Technologies|VT82C505"
 0x1106	0x0561	"unknown"	"VIA Technologies|VT82C561"
 0x1106	0x0571	"unknown"	"VIA Technologies|VT82C586 IDE [Apollo]"
@@ -2121,13 +2136,13 @@
 0x1106	0x0586	"unknown"	"VIA Technologies|VT82C586/A/B PCI-to-ISA [Apollo VP]"
 0x1106	0x0595	"unknown"	"VIA Technologies|VT82C595 [Apollo VP2]"
 0x1106	0x0596	"unknown"	"VIA Technologies|VT82C596 ISA [Apollo PRO]"
-0x1106	0x0597	"agpgart"	"VIA Technologies|VT82C597 [Apollo VP3]"
-0x1106	0x0598	"agpgart"	"VIA Technologies|VT82C598 [Apollo MVP3]"
-0x1106	0x0601	"unknown"	"VIA Technologies|VT8601"
-0x1106	0x0605	"unknown"	"VIA Technologies|VT8605 [ProSavage PM133]"
+0x1106	0x0597	"via-agp"	"VIA Technologies|VT82C597 [Apollo VP3]"
+0x1106	0x0598	"via-agp"	"VIA Technologies|VT82C598 [Apollo MVP3]"
+0x1106	0x0601	"via-agp"	"VIA Technologies|VT8601"
+0x1106	0x0605	"via-agp"	"VIA Technologies|VT8605 [ProSavage PM133]"
 0x1106	0x0680	"unknown"	"VIA Technologies|VT82C680 [Apollo P6]"
 0x1106	0x0686	"unknown"	"VIA Technologies|VT82C686 [Apollo Super]"
-0x1106	0x0691	"agpgart"	"VIA Technologies|VT82C691 [Apollo PRO]"
+0x1106	0x0691	"via-agp"	"VIA Technologies|VT82C691 [Apollo PRO]"
 0x1106	0x0692	"unknown"	"VIA Technologies Inc|North Bridge"
 0x1106	0x0693	"unknown"	"VIA Technologies|VT82C693 [Apollo Pro Plus]"
 0x1106	0x0698	"unknown"	"VIA Technologies|VT82C693A [Apollo Pro133 AGP]"
@@ -2150,38 +2165,39 @@
 0x1106	0x3068	"Bad:www.linmodems.org"	"VIA Technologies|VT82C686 [Apollo Super AC97/Modem]"
 0x1106	0x3074	"unknown"	"VIA Technologies|VT8233 PCI to ISA Bridge"
 0x1106	0x3086	"unknown"	"VIA Technologies Inc|VT82C686 Power management"
-0x1106	0x3091	"unknown"	"VIA Technologies|VT8633 [Apollo Pro266]"
-0x1106	0x3099	"unknown"	"VIA Technologies|VT8367 [KT266]"
-0x1106	0x3101	"unknown"	"VIA Technologies Inc|VT8653 CPU to PCI Bridge"
+0x1106	0x3091	"via-agp"	"VIA Technologies|VT8633 [Apollo Pro266]"
+0x1106	0x3099	"via-agp"	"VIA Technologies|VT8367 [KT266]"
+0x1106	0x3101	"via-agp"	"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	"ehci-hcd"	"VIA Technologies Inc|VT8235 USB Enhanced Controller"
 0x1106	0x3106	"via-rhine"	"VIA Technologies|VT6105 [Rhine III 10/100]"
 0x1106	0x3109	"unknown"	"VIA Technologies|VT8233C PCI to ISA Bridge"
-0x1106	0x3112	"unknown"	"VIA Technologies Inc|VT8361 CPU to PCI Bridge"
+0x1106	0x3112	"via-agp"	"VIA Technologies Inc|VT8361 CPU to PCI Bridge"
 0x1106	0x3113	"unknown"	"VIA Technologies Inc|PCI to PCI Bridge"
-0x1106	0x3116	"unknown"	"VIA Technologies Inc|CPU-to-PCI Bridge"
+0x1106	0x3116	"via-agp"	"VIA Technologies Inc|CPU-to-PCI Bridge"
 0x1106	0x3122	"unknown"	"VIA Technologies, Inc.|VT8623 [Apollo CLE266] integrated CastleRock graphics"
-0x1106	0x3123	"unknown"	"VIA Technologies Inc|VT8623 CPU to PCI Bridge"
-0x1106	0x3128	"unknown"	"VIA Technologies|P4X266A CPU-to-PCI Bridge"
+0x1106	0x3123	"via-agp"	"VIA Technologies Inc|VT8623 CPU to PCI Bridge"
+0x1106	0x3128	"via-agp"	"VIA Technologies|P4X266A CPU-to-PCI Bridge"
 0x1106	0x3133	"unknown"	"VIA Technologies Inc|VT3133 CPU to PCI Bridge"
 0x1106	0x3147	"unknown"	"VIA Technologies Inc|VT8233 PCI to ISA Bridge"
-0x1106	0x3148	"unknown"	"VIA Technologies Inc|CPU-to-PCI Bridge"
+0x1106	0x3148	"via-agp"	"VIA Technologies Inc|CPU-to-PCI Bridge"
 0x1106	0x3149	"sata_via"	"VIA Technologies Inc|VT8237 SATA150 Controller"
-0x1106	0x3156	"unknown"	"VIA Technologies Inc|P/KN266 CPU to PCI Bridge"
+0x1106	0x3156	"via-agp"	"VIA Technologies Inc|P/KN266 CPU to PCI Bridge"
 0x1106	0x3158	"unknown"	"VIA Technologies Inc|CPU-to-PCI Bridge"
-0x1106	0x3168	"unknown"	"VIA Technologies, Inc.|VT8374 P4X400 Host Controller/AGP Bridge"
+0x1106	0x3168	"via-agp"	"VIA Technologies, Inc.|VT8374 P4X400 Host Controller/AGP Bridge"
 0x1106	0x3177	"unknown"	"VIA Technologies Inc|VT8233A PCI to ISA Bridge"
 0x1106	0x3178	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x3188	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x3189	"unknown"	"VIA Technologies Inc|VT8377 CPU to PCI Bridge"
+0x1106	0x3188	"amd64-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x3189	"via-agp"	"VIA Technologies Inc|VT8377 CPU to PCI Bridge"
 0x1106	0x3198	"unknown"	"VIA Technologies Inc|CPU-to-PCI Bridge"
 0x1106	0x3202	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x3204	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x3205	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x3208	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x3205	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
+0x1106	0x3208	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x3209	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x3213	"unknown"	"VIA Technologies Inc|PCI to PCI Bridge"
+0x1106	0x3258	"via-agp"	"VIA Technologies Inc|PCI to PCI Bridge"
 0x1106	0x5030	"unknown"	"VIA Technologies|VT82C596 ACPI [Apollo PRO]"
 0x1106	0x6100	"via-rhine"	"VIA Technologies|VT85C100A [Rhine II]"
 0x1106	0x8231	"unknown"	"VIA Technologies|VT8231 [PCI-to-ISA Bridge]"
@@ -2203,7 +2219,7 @@
 0x1106	0xb101	"unknown"	"VIA Technologies Inc|VT8653 CPU to AGP Controller"
 0x1106	0xb102	"unknown"	"VIA Technologies Inc|VT8362 CPU to AGP Controller"
 0x1106	0xb103	"unknown"	"VIA Technologies Inc|VT8615 CPU to AGP Controller"
-0x1106	0xb112	"unknown"	"VIA Technologies Inc|VT8361 CPU to AGP Controller"
+0x1106	0xb112	"via-agp"	"VIA Technologies Inc|VT8361 CPU to AGP Controller"
 0x1106	0xb113	"unknown"	"VIA Technologies Inc|I/O APIC"
 0x1106	0xb115	"unknown"	"VIA Technologies Inc|CPU to AGP Controller"
 0x1106	0xb116	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP)"
@@ -4099,7 +4115,7 @@
 0x8086	0x1112	"unknown"	"Intel Corporation|82815 Internal Graphics Device"
 0x8086	0x1120	"unknown"	"Intel Corporation|82815 Host-Hub Interface Bridge / DRAM Ctrlr"
 0x8086	0x1121	"unknown"	"Intel Corporation|82815 AGP Bridge"
-0x8086	0x1130	"agpgart"	"Intel Corporation|82815 815 Chipset Host Bridge and Memory Controller Hub"
+0x8086	0x1130	"intel-agp"	"Intel Corporation|82815 815 Chipset Host Bridge and Memory Controller Hub"
 0x8086	0x1131	"unknown"	"Intel Corporation|82815/82815EM/EP AGP Bridge"
 0x8086	0x1132	"Card:Intel 815"	"Intel Corporation|82815 CGC [Chipset Graphics Controller]"
 0x8086	0x1161	"unknown"	"Intel Corporation|82806AA PCI64 Hub Advanced Programmable Interrupt Controller"
@@ -4302,11 +4318,11 @@
 0x8086	0x1a10	"unknown"	"Intel Corporation|Celeron(tm) Processor to I/O Controller"
 0x8086	0x1a11	"unknown"	"Intel Corporation|Celeron(tm) Processor to I/O Controller"
 0x8086	0x1a20	"unknown"	"Intel Corporation|82840"
-0x8086	0x1a21	"agpgart"	"Intel Corporation|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
+0x8086	0x1a21	"intel-agp"	"Intel Corporation|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
 0x8086	0x1a22	"unknown"	"Intel Corporation|82840 Host to I/O Hub Bridge (Quad PCI)"
 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	0x1a30	"unknown"	"Intel Corporation|82845 845 (Brookdale) Chipset Host Bridge"
+0x8086	0x1a30	"intel-agp"	"Intel Corporation|82845 845 (Brookdale) Chipset Host Bridge"
 0x8086	0x1a31	"unknown"	"Intel Corporation|82845 845 (Brookdale) Chipset AGP Bridge"
 0x8086	0x2125	"unknown"	"Intel Corporation|82801AB AC97 Audio Controller"
 0x8086	0x2410	"i810-tco"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
@@ -4378,8 +4394,8 @@
 0x8086	0x24dc	"unknown"	"Intel Corp.|82801EB LPC Interface Controller"
 0x8086	0x24dd	"ehci-hcd"	"Intel Corporation|USB Enhanced Controller"
 0x8086	0x24de	"unknown"	"Intel Corp.|82801EB USB EHCI Controller #2"
-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	0x2500	"intel-agp"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
+0x8086	0x2501	"intel-agp"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2502	"unknown"	"Intel Corporation|82820"
 0x8086	0x2503	"unknown"	"Intel Corporation|82820"
 0x8086	0x2504	"unknown"	"Intel Corporation|82820"
@@ -4387,8 +4403,8 @@
 0x8086	0x250f	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset PCI to AGP Bridge"
 0x8086	0x2520	"unknown"	"Intel Corporation|82805AA MTH Memory Translator Hub"
 0x8086	0x2521	"unknown"	"Intel Corporation|82804AA MRH-S Memory Repeater Hub for SDRAM"
-0x8086	0x2530	"agpgart"	"Intel Corporation|82850 850 (Tehama) Chipset Host Bridge (MCH)"
-0x8086	0x2531	"agpgart"	"Intel Corporation|82860 860 (Wombat) Chipset Host Bridge (MCH)"
+0x8086	0x2530	"intel-agp"	"Intel Corporation|82850 850 (Tehama) Chipset Host Bridge (MCH)"
+0x8086	0x2531	"intel-agp"	"Intel Corporation|82860 860 (Wombat) Chipset Host Bridge (MCH)"
 0x8086	0x2532	"unknown"	"Intel Corporation|82850 850 (Tehama) Chipset AGP Bridge"
 0x8086	0x2533	"unknown"	"Intel Corporation|82860 860 (Wombat) Chipset AGP Bridge"
 0x8086	0x2534	"unknown"	"Intel Corporation|82860 Hub Interface_C Bridge"
@@ -4405,33 +4421,33 @@
 0x8086	0x2547	"unknown"	"Intel Corporation|e7500 HI_D Virtual PCI-to-PCI Bridge (F0)"
 0x8086	0x2548	"unknown"	"Intel Corporation|e7500 HI_D Virtual PCI-to-PCI Bridge (F1)"
 0x8086	0x254c	"unknown"	"Intel Corporation|E7501 Host Controller"
-0x8086	0x2550	"unknown"	"Intel Corporation|E7505 Host Controller"
+0x8086	0x2550	"intel-agp"	"Intel Corporation|E7505 Host Controller"
 0x8086	0x2551	"unknown"	"Intel Corporation|E7205/E7505 Host RAS Controller"
 0x8086	0x2552	"unknown"	"Intel Corporation|E7205/E7505 PCI-to-AGP Bridge"
 0x8086	0x2553	"unknown"	"Intel Corporation|E7505 Hub Interface_B PCI-to-PCI Bridge"
 0x8086	0x2554	"unknown"	"Intel Corporation|E7505 Hub I/F_B PCI-to-PCI Bridge Error Report"
-0x8086	0x255d	"unknown"	"Intel Corporation|E7205 Host Controller"
-0x8086	0x2560	"agpgart"	"Intel Corporation|82845 845 Chipset Host Bridge (MCH)"
+0x8086	0x255d	"intel-agp"	"Intel Corporation|E7205 Host Controller"
+0x8086	0x2560	"intel-agp"	"Intel Corporation|82845 845 Chipset Host Bridge (MCH)"
 0x8086	0x2561	"unknown"	"Intel Corp.|82845G/GL [Brookdale-G] Chipset AGP Bridge"
 0x8086	0x2562	"Card:Intel 845"	"Intel Corporation|82845 CGC [Chipset Graphics Controller]"
-0x8086	0x2570	"unknown"	"Intel Corp.|82865G [Springdale-G] Chipset Host Bridge"
+0x8086	0x2570	"intel-agp"	"Intel Corp.|82865G [Springdale-G] Chipset Host Bridge"
 0x8086	0x2571	"unknown"	"Intel Corp.|82865G/PE/P Processor to AGP Controller"
 0x8086	0x2572	"Card:Intel 865"	"Intel Corporation|865 Chipset Graphics Controller"
 0x8086	0x2573	"unknown"	"Intel Corp.|82865G/PE/P Processor to PCI to CSA Bridge"
 0x8086	0x2576	"unknown"	"Intel Corp.|82864G/PE/P Processor to I/O Memory Interface"
-0x8086	0x2578	"unknown"	"Intel Corporation|875 DRAM Controller / Host-Hub Interface"
+0x8086	0x2578	"intel-agp"	"Intel Corporation|875 DRAM Controller / Host-Hub Interface"
 0x8086	0x2579	"unknown"	"Intel Corporation|875 Host-AGP Bridge"
 0x8086	0x257b	"unknown"	"Intel Corp.|82875P Processor to PCI to CSA Bridge"
 0x8086	0x257e	"unknown"	"Intel Corp.|82875P Processor to I/O Memory Interface"
 0x8086	0x3092	"i2o_block"	"Intel Corporation|Integrated RAID"
 0x8086	0x3200	"unknown"	"Intel Corporation|31244 PCI-X to Serial ATA Controller"
-0x8086	0x3340	"unknown"	"Intel Corp.|82855PM Processor to I/O Controller"
+0x8086	0x3340	"intel-agp"	"Intel Corp.|82855PM Processor to I/O Controller"
 0x8086	0x3341	"unknown"	"Intel Corp.|82855PM Processor to AGP Controller"
-0x8086	0x3575	"agpgart"	"Intel Corporation|82830 Host-Hub I/F Bridge SDRAM Controller"
+0x8086	0x3575	"intel-agp"	"Intel Corporation|82830 Host-Hub I/F Bridge SDRAM Controller"
 0x8086	0x3576	"unknown"	"Intel Corporation|82830 Host-AGP Bridge"
 0x8086	0x3577	"Card:Intel 830"	"Intel Corporation|82830 CGC Integrated Graphics Device"
 0x8086	0x3578	"unknown"	"Intel Corporation|82830 CPU to I/O Bridge"
-0x8086	0x3580	"unknown"	"Intel Corporation|852GM Host-Hub Interface Bridge"
+0x8086	0x3580	"intel-agp"	"Intel Corporation|852GM Host-Hub Interface Bridge"
 0x8086	0x3582	"Card:Intel 85x"	"Intel Corporation|852GM/852GME/855GM/855GME Chipset Graphics Controller"
 0x8086	0x3584	"unknown"	"Intel Corporation|852GM System Memory Controller"
 0x8086	0x3585	"unknown"	"Intel Corporation|852GM Configuration Process"
@@ -4453,20 +4469,20 @@
 0x8086	0x7111	"unknown"	"Intel Corporation|82371AB PIIX4 IDE"
 0x8086	0x7112	"usb-uhci"	"Intel Corporation|82371AB PIIX4 USB"
 0x8086	0x7113	"sonypi"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
-0x8086	0x7120	"agpgart"	"Intel Corporation|82810 GMCH [Graphics Memory Controller Hub]"
+0x8086	0x7120	"intel-agp"	"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]"
+0x8086	0x7122	"intel-agp"	"Intel Corporation|82810-DC100 GMCH [Graphics Memory Controller Hub]"
 0x8086	0x7123	"Card:Intel 810"	"Intel Corporation|82810-DC100 CGC [Chipset Graphics Controller]"
-0x8086	0x7124	"agpgart"	"Intel Corporation|82810E GMCH [Graphics Memory Controller Hub]"
+0x8086	0x7124	"intel-agp"	"Intel Corporation|82810E GMCH [Graphics Memory Controller Hub]"
 0x8086	0x7125	"Card:Intel 810"	"Intel Corporation|82810E CGC [Chipset Graphics Controller]"
 0x8086	0x7126	"unknown"	"Intel Corporation|82810 810 Chipset Host Bridge and Memory Controller Hub"
 0x8086	0x7127	"unknown"	"Intel Corporation|82810-DC133 Graphics Device (FSB 133 MHz)"
 0x8086	0x7128	"unknown"	"Intel Corporation|82810-M DC-100 Host Bridge and Memory Controller Hub"
 0x8086	0x712a	"unknown"	"Intel Corporation|82810-M DC-133 Host Bridge and Memory Controller Hub"
-0x8086	0x7180	"agpgart"	"Intel Corporation|440LX/EX - 82443LX/EX Host bridge"
+0x8086	0x7180	"intel-agp"	"Intel Corporation|440LX/EX - 82443LX/EX Host bridge"
 0x8086	0x7181	"unknown"	"Intel Corporation|440LX/EX - 82443LX/EX AGP bridge"
 0x8086	0x7182	"unknown"	"Intel Corporation|440LX/EX"
-0x8086	0x7190	"agpgart"	"Intel Corporation|440BX/ZX - 82443BX/ZX Host bridge"
+0x8086	0x7190	"intel-agp"	"Intel Corporation|440BX/ZX - 82443BX/ZX Host bridge"
 0x8086	0x7191	"unknown"	"Intel Corporation|440BX/ZX - 82443BX/ZX AGP bridge"
 0x8086	0x7192	"unknown"	"Intel Corporation|440BX/ZX - 82443BX/ZX Host bridge (AGP disabled)"
 0x8086	0x7194	"unknown"	"Intel|82440MX CPU to I/O Controller"
@@ -4476,7 +4492,7 @@
 0x8086	0x7199	"unknown"	"Intel|82440MX EIDE Controller"
 0x8086	0x719a	"usb-uhci"	"Intel|82440MX USB Universal Host Controller"
 0x8086	0x719b	"unknown"	"Intel|82440MX Power Management Controller"
-0x8086	0x71a0	"agpgart"	"Intel Corporation|440GX - 82443GX Host bridge"
+0x8086	0x71a0	"intel-agp"	"Intel Corporation|440GX - 82443GX Host bridge"
 0x8086	0x71a1	"unknown"	"Intel Corporation|440GX - 82443GX AGP bridge"
 0x8086	0x71a2	"unknown"	"Intel Corporation|440GX - 82443GX Host bridge (AGP disabled)"
 0x8086	0x7600	"unknown"	"Intel Corporation|82372FB PCI to ISA Bridge"