summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-09-21 10:33:05 +0000
committerThierry Vignaud <tv@mandriva.org>2009-09-21 10:33:05 +0000
commit857716e086fe38be14dfd2e6a6190542032081e1 (patch)
treed31fe5fde0d42464918331a4584503cf55dc282c
parentc00e957540bcf79e40890c73f2dc498fbfd4f845 (diff)
downloadldetect-lst-857716e086fe38be14dfd2e6a6190542032081e1.tar
ldetect-lst-857716e086fe38be14dfd2e6a6190542032081e1.tar.gz
ldetect-lst-857716e086fe38be14dfd2e6a6190542032081e1.tar.bz2
ldetect-lst-857716e086fe38be14dfd2e6a6190542032081e1.tar.xz
ldetect-lst-857716e086fe38be14dfd2e6a6190542032081e1.zip
rename "GeForce 3 to GeForce 4" as "GeForce 2 MX to GeForce 4" (#53841)
-rw-r--r--lst/Cards+2
-rw-r--r--lst/Makefile4
-rw-r--r--lst/pcitable128
3 files changed, 67 insertions, 67 deletions
diff --git a/lst/Cards+ b/lst/Cards+
index fe5aa37e..46595447 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -265,7 +265,7 @@ NAME NVIDIA RIVA TNT to GeForce 2
DRIVER nv
#DRIVER2 nvidia71xx (not compatible with x.org server 1.6)
-NAME NVIDIA GeForce 3 to GeForce 4
+NAME NVIDIA GeForce 2 MX to GeForce 4
DRIVER nv
DRIVER2 nvidia96xx
diff --git a/lst/Makefile b/lst/Makefile
index 7239b2f1..9465ecbf 100644
--- a/lst/Makefile
+++ b/lst/Makefile
@@ -22,8 +22,8 @@ check:
@diff -u pcitable.x86_64 .pcitable
@../convert/merge2pcitable.pl pcitable pcitable pcitable > .pcitable
@diff -u pcitable .pcitable
- @../convert/merge2pcitable.pl pcitable usbtable usbtable > .usbtable
- @diff -u usbtable .usbtable
+ #@../convert/merge2pcitable.pl pcitable usbtable usbtable > .usbtable
+ #@diff -u usbtable .usbtable
@cd ../convert; ./verify_Cards.pl
@rm -f .pcitable .usbtable
diff --git a/lst/pcitable b/lst/pcitable
index b7883719..3ab82e0d 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -847,13 +847,13 @@
0x1042 0x3020 "generic"
0x1043 0x0200 "Card:NVIDIA RIVA TNT to GeForce 2"
0x1043 0x0675 "ISDN:hisax,type=35"
-0x1043 0x4015 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x401d "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x4021 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x4057 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x8047 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x807b "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1043 0x80bb "Card:NVIDIA GeForce 3 to GeForce 4"
+0x1043 0x4015 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x401d "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x4021 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x4057 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x8047 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x807b "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1043 0x80bb "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x1043 0x80df "Card:NVIDIA GeForce 6100 and later"
0x1043 0x81f4 "Card:NVIDIA GeForce 6100 and later"
0x1044 0xa400 "eata"
@@ -864,7 +864,7 @@
0x1045 0xd568 "opti621"
0x1048 0x0a32 "Card:3Dlabs Glint / Permedia-based cards (software cursor)"
0x1048 0x0c60 "Card:NVIDIA RIVA TNT to GeForce 2"
-0x1048 0x0d22 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x1048 0x0d22 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x1048 0x1000 "ISDN:hisax,type=18"
0x1048 0x3000 "ISDN:hisax,type=18"
0x104a 0x0010 "Card:VESA driver (generic)"
@@ -1064,15 +1064,15 @@
0x10de 0x00fc "Card:NVIDIA GeForce FX series"
0x10de 0x00fd "Card:NVIDIA GeForce FX series"
0x10de 0x00fe "Card:NVIDIA GeForce FX series"
-0x10de 0x00ff "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x00ff "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x0100 "Card:NVIDIA RIVA TNT to GeForce 2"
0x10de 0x0101 "Card:NVIDIA RIVA TNT to GeForce 2"
0x10de 0x0102 "Card:NVIDIA RIVA TNT to GeForce 2"
0x10de 0x0103 "Card:NVIDIA RIVA TNT to GeForce 2"
-0x10de 0x0110 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0111 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0112 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0113 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x0110 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0111 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0112 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0113 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x0140 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0141 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0142 "Card:NVIDIA GeForce 6100 and later"
@@ -1108,40 +1108,40 @@
0x10de 0x016c "Card:NVIDIA GeForce 6100 and later"
0x10de 0x016d "Card:NVIDIA GeForce 6100 and later"
0x10de 0x016e "Card:NVIDIA GeForce 6100 and later"
-0x10de 0x0170 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0171 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0172 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0173 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0174 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0175 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0176 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0177 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0178 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0179 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x017a "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x017b "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x017c "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x017d "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0181 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0182 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0183 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0184 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0185 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0186 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0187 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0188 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0189 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x018a "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x018b "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x018c "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x018d "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x0170 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0171 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0172 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0173 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0174 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0175 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0176 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0177 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0178 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0179 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x017a "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x017b "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x017c "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x017d "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0181 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0182 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0183 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0184 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0185 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0186 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0187 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0188 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0189 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x018a "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x018b "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x018c "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x018d "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x0191 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0193 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0194 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0197 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x019d "Card:NVIDIA GeForce 6100 and later"
0x10de 0x019e "Card:NVIDIA GeForce 6100 and later"
-0x10de 0x01a0 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x01a0 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x01c1 "slamr"
0x10de 0x01d0 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x01d1 "Card:NVIDIA GeForce 6100 and later"
@@ -1155,11 +1155,11 @@
0x10de 0x01dd "Card:NVIDIA GeForce 6100 and later"
0x10de 0x01de "Card:NVIDIA GeForce 6100 and later"
0x10de 0x01df "Card:NVIDIA GeForce 6100 and later"
-0x10de 0x01f0 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0200 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0201 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0202 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0203 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x01f0 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0200 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0201 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0202 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0203 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x0210 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0211 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0212 "Card:NVIDIA GeForce 6100 and later"
@@ -1177,20 +1177,20 @@
0x10de 0x0244 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0245 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0247 "Card:NVIDIA GeForce 6100 and later"
-0x10de 0x0250 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0251 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0252 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0253 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0258 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0259 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x025b "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0280 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0281 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0282 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0286 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0288 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x0289 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x10de 0x028c "Card:NVIDIA GeForce 3 to GeForce 4"
+0x10de 0x0250 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0251 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0252 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0253 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0258 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0259 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x025b "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0280 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0281 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0282 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0286 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0288 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x0289 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x10de 0x028c "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x10de 0x0290 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0291 "Card:NVIDIA GeForce 6100 and later"
0x10de 0x0292 "Card:NVIDIA GeForce 6100 and later"
@@ -1786,8 +1786,8 @@
0x1414 0x0002 "tulip"
0x1432 0x9130 "8139too"
0x1462 0x5501 "Card:NVIDIA RIVA TNT to GeForce 2"
-0x1462 0x8725 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1462 0x9000 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x1462 0x8725 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1462 0x9000 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x1462 0x9110 "Card:NVIDIA GeForce 6100 and later"
0x1462 0x9119 "Card:NVIDIA GeForce 6100 and later"
0x1462 0x9123 "Card:NVIDIA GeForce 6100 and later"
@@ -1916,8 +1916,8 @@
0x1743 0x8139 "8139too"
0x17b3 0xab08 "tulip"
0x1813 0x4000 "Bad:www.linmodems.org"
-0x1888 0x3503 "Card:NVIDIA GeForce 3 to GeForce 4"
-0x1888 0x3505 "Card:NVIDIA GeForce 3 to GeForce 4"
+0x1888 0x3503 "Card:NVIDIA GeForce 2 MX to GeForce 4"
+0x1888 0x3505 "Card:NVIDIA GeForce 2 MX to GeForce 4"
0x18ca 0x0020 "Card:SiS SiS / XGI 315 / 330 / 340 series-based cards"
0x18ca 0x0040 "Card:SiS SiS / XGI 315 / 330 / 340 series-based cards"
0x18ca 0x0047 "Card:SiS SiS / XGI 315 / 330 / 340 series-based cards"