- drop CardsNames (not used anymore by drakx)

- Cards+: add Option "XaaNoPixmapCache" for i810 as suggested on cooker.
          to be removed when the kernel works ok
- Cards+ (and pcitable): to cleanup the tree in XFdrake
  - remove "Spacewalker HOT", "Octek", "Creative Blaster Exxtreme",
    "Atrend", "ATrend", "SPEA", "Spider", "Actix", "Canopus", "Cardex"
    entries
  - remove "Generic VGA compatible" and entries using it
  - remove "Unsupported VGA compatible"
  - replace "SMI" by "Silicon Motion"
  - replace "ELSA" by "Elsa"
  - replace "LeadTek" by "Leadtek"

7 files changed, 100 insertions, 269 deletions

diff --git a/convert/Cards2CardsNames.pl b/convert/Cards2CardsNames.pl
deleted file mode 100755
index 9196c4ce..00000000
--- a/convert/Cards2CardsNames.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl
-
-$vendors = join '|', map { chomp; quotemeta } <DATA>;
-
-%substs = (
-"3Dlabs" => "3DLabs",
-"COMPAQ" => "Compaq",
-"Creative Blaster Exxtreme" => "Creative Labs Blaster Exxtreme",
-"ELSA" => "Elsa",
-"ATrend" => "Atrend",
-"Ocean (octek)" => "Octek",
-"HOT" => "Spacewalker Hot",
-);
-
-print "# This file is auto-generated from Cards+, DO NOT MODIFY\n";
-print "#\n";
-
-foreach (<>) {
-    my ($n) = /^NAME (.*)/ or next;
-    $_ = $n;
-    while (my ($k, $v) = each %substs) { s/^\Q$k/$v/; }
-
-    if (my ($v, $more) = /^($vendors)\s*-?(.*)/) {
-	$_ = "$v|$more";
-    } else {
-	$_ = "Other|$_";
-    }
-    print qq{$_=>$n\n};
-}
-
-__DATA__
-3DLabs
-Compaq
-Dell
-Elsa
-Rendition Verite
-Intel
-Oak
-Ark Logic
-Cardex
-Digital
-RIVA
-Spider
-Canopus
-Leadtek
-NVIDIA
-Octek
-ASUS
-Actix
-Avance Logic
-ET
-Genoa
-SMI
-SPEA
-VideoLogic
-Creative Labs
-Toshiba
-Orchid
-Chaintech
-Cirrus Logic
-AOpen
-SiS
-Chips & Technologies
-Number Nine
-Miro
-STB
-Matrox
-Hercules
-Trident
-Sun
-Diamond
-S3
-ATI
diff --git a/convert/README.pcitable b/convert/README.pcitable
index 747a4f98..b89e5a8c 100644
--- a/convert/README.pcitable
+++ b/convert/README.pcitable
@@ -16,6 +16,8 @@ rm -f pcids.html ; wget http://www.begent.co.uk/pcids.htm
 # you can also try the following. BUT be careful when choosing cards needing subids. Ask pixel@mandrakesoft.com first!
 ./merge2pcitable.pl --keep-subids begent_pcids_htm pcids.htm pcitable > pcitable.new
 
+# http://members.hyperlink.net.au/~chart/download/pcidevs.txt
+
 
 # with redhat's pcitable in /tmp/rh_pcitable (from kudzu or anaconda)
 ./merge2pcitable.pl pcitable /tmp/rh_pcitable pcitable > pcitable.new
diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index e3b50869..26e1593c 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,6 @@
 %define name ldetect-lst
 %define version 0.1.4
-%define release 3mdk
+%define release 4mdk
 
 Name: %{name}
 Version: %{version}
@@ -62,6 +62,20 @@ fi
 %{_bindir}/*
 
 %changelog
+* Sun Jul 28 2002 Pixel <pixel@mandrakesoft.com> 0.1.4-4mdk
+- drop CardsNames (not used anymore by drakx)
+- Cards+: add Option "XaaNoPixmapCache" for i810 as suggested on cooker.
+          to be removed when the kernel works ok
+- Cards+ (and pcitable): to cleanup the tree in XFdrake
+  - remove "Spacewalker HOT", "Octek", "Creative Blaster Exxtreme",
+    "Atrend", "ATrend", "SPEA", "Spider", "Actix", "Canopus", "Cardex"
+    entries
+  - remove "Generic VGA compatible" and entries using it
+  - remove "Unsupported VGA compatible"
+  - replace "SMI" by "Silicon Motion"
+  - replace "ELSA" by "Elsa"
+  - replace "LeadTek" by "Leadtek"
+
 * Sun Jul 21 2002 Pixel <pixel@mandrakesoft.com> 0.1.4-3mdk
 - pcitable
   - bttc -> bttv (typo fix)
diff --git a/lst/.cvsignore b/lst/.cvsignore
index 745c8546..e69de29b 100644
--- a/lst/.cvsignore
+++ b/lst/.cvsignore
@@ -1 +0,0 @@
-CardsNames
diff --git a/lst/Cards+ b/lst/Cards+
index 0e169ca9..740c6c58 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -26,17 +26,6 @@
 #
 #
 
-# VGA
-
-NAME Generic VGA compatible
-SERVER VGA16
-DRIVER vga
-
-NAME Unsupported VGA compatible
-SERVER VGA16
-DRIVER vga
-UNSUPPORTED
-
 #Chips & Technologies
 
 #untested
@@ -262,12 +251,6 @@ SEE Cirrus Logic GD542x
 NAME ALG-5434(E)
 SEE Cirrus Logic GD543x
 
-NAME Actix ProStar
-SEE Cirrus Logic GD542x
-
-NAME Actix ProStar 64
-SEE Cirrus Logic GD543x
-
 #tested
 NAME Acumos AVGA3
 SEE Cirrus Logic GD542x
@@ -275,9 +258,6 @@ SEE Cirrus Logic GD542x
 NAME DFI-WG1000
 SEE Cirrus Logic GD542x
 
-NAME Spider VLB Plus
-SEE Cirrus Logic GD542x
-
 NAME VI720
 SEE Cirrus Logic GD543x
 
@@ -328,21 +308,6 @@ SERVER SVGA
 DRIVER vga
 UNSUPPORTED
 
-NAME Octek VL-VGA-26
-SEE Cirrus Logic GD542x
-
-NAME Octek VL-VGA-28
-SEE Cirrus Logic GD542x
-
-NAME Octek Combo-26
-SEE Cirrus Logic GD542x
-
-NAME Octek Combo-28
-SEE Cirrus Logic GD542x
-
-NAME Octek AVGA-20
-SEE Cirrus Logic GD542x
-
 # S3 801/805
 
 NAME S3 801/805 (generic)
@@ -357,12 +322,6 @@ SEE S3 801/805 (generic)
 NAME S3 86C805 (generic)
 SEE S3 801/805 (generic)
 
-NAME Actix GE32i
-SERVER S3
-DRIVER s3
-NEEDVIDEORAM
-UNSUPPORTED
-
 NAME Orchid Fahrenheit 1280
 SERVER S3
 DRIVER s3
@@ -446,12 +405,6 @@ SEE S3 Trio32 (generic)
 NAME Diamond Stealth64 Video 2001 series (2121/2201)
 SEE S3 Trio64V+ (generic)
 
-NAME Cardex Trio64
-SEE S3 Trio64 (generic)
-
-NAME Cardex Trio64Pro
-SEE S3 Trio64 (generic)
-
 NAME Miro Crystal 12SD
 SEE S3 Trio32 (generic)
 
@@ -464,9 +417,6 @@ SEE S3 868 with SDAC (86C716)
 NAME Diamond Stealth64 Video 2120/2200
 SEE S3 868 with SDAC (86C716)
 
-NAME SPEA/V7 Mirage P64 with S3 Trio64
-SEE S3 Trio64 (generic)
-
 NAME Number Nine FX Vision 330
 SEE S3 Trio64 (generic)
 
@@ -522,7 +472,7 @@ SEE S3 Trio64V2/DX (generic)
 NAME S3 86C785 (Trio64V2/GX)
 SEE S3 Trio64V2/GX (generic)
 
-NAME ELSA WINNER 1000/T2D
+NAME Elsa WINNER 1000/T2D
 SEE S3 Trio64V2/DX (generic)
 
 
@@ -544,10 +494,10 @@ SEE S3 Aurora64V+ (generic)
 NAME SHARP 9090
 SEE S3 Aurora64V+ (generic)
 
-NAME COMPAQ Armada 7730MT
+NAME Compaq Armada 7730MT
 SEE S3 Aurora64V+ (generic)
 
-NAME COMPAQ Armada 7380DMT
+NAME Compaq Armada 7380DMT
 SEE S3 Aurora64V+ (generic)
 
 
@@ -594,10 +544,10 @@ SEE S3 Trio64V+ (generic)
 NAME STB Powergraph 64
 SEE S3 Trio64 (generic)
 
-NAME ELSA Winner 1000TRIO
+NAME Elsa Winner 1000TRIO
 SEE S3 Trio64 (generic)
 
-NAME ELSA Winner 1000TRIO/V
+NAME Elsa Winner 1000TRIO/V
 SEE S3 Trio64V+ (generic)
 
 NAME Hercules Graphite Terminator 64
@@ -621,57 +571,54 @@ NAME Number Nine FX Motion 771
 LINE    #s3RefClk  16
 SEE S3 968 (generic)
 
-NAME Spider Tarantula 64
-SEE S3 964 (generic)
-
 NAME Miro Crystal 80SV
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
-NAME ELSA Winner 2000PRO-2
+NAME Elsa Winner 2000PRO-2
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "ELSA_w2000pro"
 
-NAME ELSA Winner 2000PRO-4
+NAME Elsa Winner 2000PRO-4
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "ELSA_w2000pro"
 
-NAME ELSA Winner 2000PRO/X-2
+NAME Elsa Winner 2000PRO/X-2
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME ELSA Winner 2000PRO/X-4
+NAME Elsa Winner 2000PRO/X-4
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME ELSA Winner 2000PRO/X-8
+NAME Elsa Winner 2000PRO/X-8
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME ELSA Winner 2000AVI
+NAME Elsa Winner 2000AVI
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME ELSA Gloria-4
+NAME Elsa Gloria-4
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME ELSA Gloria-8
+NAME Elsa Gloria-8
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
@@ -682,21 +629,21 @@ SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
-NAME LeadTek WinFast S430
+NAME Leadtek WinFast S430
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
 NAME WinFast S430
-SEE LeadTek WinFast S430
+SEE Leadtek WinFast S430
 
-NAME LeadTek WinFast S510
+NAME Leadtek WinFast S510
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
 NAME WinFast S510
-SEE LeadTek WinFast S510
+SEE Leadtek WinFast S510
 
 # S3 928
 
@@ -709,20 +656,20 @@ UNSUPPORTED
 NAME S3 86C928 (generic)
 SEE S3 928 (generic)
 
-NAME ELSA Winner 1000VL
+NAME Elsa Winner 1000VL
 SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 UNSUPPORTED
 LINE     # the following settings should be detected and set automatically by XF86_S3
-LINE     # if the serial number of the ELSA card is printed correctly:
+LINE     # if the serial number of the Elsa card is printed correctly:
 LINE     #ClockChip "icd2061a"
 LINE     #Membase 0xf8000000
 
-NAME ELSA Winner 1000TwinBus
-SEE ELSA Winner 1000VL
+NAME Elsa Winner 1000TwinBus
+SEE Elsa Winner 1000VL
 
-NAME ELSA Winner 2000
+NAME Elsa Winner 2000
 SEE S3 928 (generic)
 
 NAME Miro Crystal 16S
@@ -856,13 +803,13 @@ NAME S3 86C280 (ViRGE/MX+)
 SEE S3 ViRGE/MX+ (generic)
 
 
-NAME ELSA Victory 3D
+NAME Elsa Victory 3D
 SEE S3 ViRGE (generic)
 
-NAME ELSA Victory 3DX
+NAME Elsa Victory 3DX
 SEE S3 ViRGE/DX (generic)
 
-NAME ELSA Winner 3000-S
+NAME Elsa Winner 3000-S
 SEE S3 ViRGE (generic)
 
 NAME Number Nine Visual 9FX Reality 332
@@ -883,9 +830,6 @@ SEE S3 ViRGE (generic)
 NAME Diamond Multimedia Stealth 3D 2000 PRO
 SEE S3 ViRGE/DX (generic)
 
-NAME Canopus Co. Power Window 3DV
-SEE S3 ViRGE (generic)
-
 NAME DataExpert DSV3325
 SEE S3 ViRGE (generic)
 
@@ -907,13 +851,13 @@ SEE S3 ViRGE/DX (generic)
 NAME AOpen PT75
 SEE S3 ViRGE/DX (generic)
 
-NAME LeadTek WinFast 3D S600
+NAME Leadtek WinFast 3D S600
 SEE S3 ViRGE (generic)
 
 NAME WinFast 3D S600
-SEE LeadTek WinFast 3D S600
+SEE Leadtek WinFast 3D S600
 
-NAME LeadTek WinFast 3D S680
+NAME Leadtek WinFast 3D S680
 SEE S3 ViRGE/GX2 (generic)
 
 NAME Miro MiroMedia 3D
@@ -948,16 +892,16 @@ LINE      #Option "pci_retry"
 NAME S3 86C988 (ViRGE/VX)
 SEE S3 ViRGE/VX (generic)
 
-NAME ELSA Winner 3000
+NAME Elsa Winner 3000
 SEE S3 ViRGE/VX (generic)
 
-NAME ELSA Winner 3000-M-22
+NAME Elsa Winner 3000-M-22
 SEE S3 ViRGE/VX (generic)
 
-NAME ELSA Winner 3000-L-42
+NAME Elsa Winner 3000-L-42
 SEE S3 ViRGE/VX (generic)
 
-NAME ELSA Winner 2000AVI/3D
+NAME Elsa Winner 2000AVI/3D
 SEE S3 ViRGE/VX (generic)
 
 NAME Diamond Stealth 3D 3000
@@ -1103,12 +1047,6 @@ SEE ET6000 (generic)
 NAME ET6300 (generic)
 SEE ET6000 (generic)
 
-NAME Cardex Cobra
-SEE ET4000 W32i, W32p (generic)
-
-NAME Cardex Challenger (Pro)
-SEE ET4000 W32i, W32p (generic)
-
 NAME Colorgraphic Dual Lightning
 SEE ET4000 W32i, W32p (generic)
 
@@ -1142,7 +1080,7 @@ SEE ET4000 W32i, W32p (generic)
 NAME Integral FlashPoint
 SEE ET4000 W32i, W32p (generic)
 
-NAME LeadTek WinFast S200
+NAME Leadtek WinFast S200
 SEE ET4000 W32i, W32p (generic)
 
 NAME Matrox Comet
@@ -1155,7 +1093,7 @@ NAME Miro MiroVideo 20TD
 SEE ET4000 W32i, W32p (generic)
 
 NAME WinFast S200
-SEE LeadTek WinFast S200
+SEE Leadtek WinFast S200
 
 NAME Sigma Concorde
 SEE ET4000/W32 (generic)
@@ -1163,9 +1101,6 @@ SEE ET4000/W32 (generic)
 NAME Sigma Legend
 SEE ET4000 (generic)
 
-NAME SPEA/V7 ShowTime Plus
-SEE ET4000 W32i, W32p (generic)
-
 NAME STB LightSpeed
 SEE ET4000 W32i, W32p (generic)
 
@@ -1214,9 +1149,6 @@ SEE ET6000 (generic)
 NAME MediaVision Proaxcel 128
 SEE ET6000 (generic)
 
-NAME ATrend ATC-2165A
-SEE ET6000 (generic)
-
 NAME Interay PMC Viper
 SEE ET6000 (generic)
 
@@ -1555,12 +1487,6 @@ SERVER SVGA
 DRIVER vga
 UNSUPPORTED
 
-NAME SPEA/V7 Mirage VEGA Plus
-LINE   #chipset "ali2228"
-SERVER SVGA
-DRIVER vga
-UNSUPPORTED
-
 # ARK Logic
 
 NAME Ark Logic ARK1000PV (generic)
@@ -1770,12 +1696,6 @@ NAME Trident CyberBlade (generic)
 SERVER SVGA
 DRIVER trident
 
-NAME Trident TVGA 8800BR
-SEE Generic VGA compatible
-
-NAME Trident TVGA 8800CS
-SEE Generic VGA compatible
-
 NAME Trident Cyber 9525 (generic)
 SERVER SVGA
 DRIVER trident
@@ -2076,22 +1996,22 @@ UTAH_GLX_EXPERIMENTAL
 NAME RIVA Ultra TNT2 
 SEE RIVA TNT2
 
-NAME ELSA VICTORY ERAZOR
+NAME Elsa VICTORY ERAZOR
 SEE RIVA128
 
-NAME ELSA VICTORY ERAZOR LT
+NAME Elsa VICTORY ERAZOR LT
 SEE RIVA128
 
-NAME ELSA Winner 1000 R3D
+NAME Elsa Winner 1000 R3D
 SEE RIVA128
 
-NAME ELSA ERAZOR II
+NAME Elsa ERAZOR II
 SEE RIVA TNT
 
-NAME ELSA ERAZOR III
+NAME Elsa ERAZOR III
 SEE RIVA TNT2
 
-NAME ELSA Synergy II
+NAME Elsa Synergy II
 SEE RIVA TNT2
 
 NAME Leadtek WinFast 3D S320II
@@ -2133,10 +2053,10 @@ SEE RIVA TNT2
 NAME Guillemot Maxi Gamer Xentor 32
 SEE RIVA TNT2
 
-NAME Creative Graphics Blaster TNT
+NAME Creative Labs Graphics Blaster TNT
 SEE RIVA TNT
 
-NAME Creative Graphics Blaster TNT2
+NAME Creative Labs Graphics Blaster TNT2
 SEE RIVA TNT2
 
 NAME Chaintech Desperado RI20
@@ -2160,15 +2080,6 @@ SEE RIVA TNT
 NAME MELCO WGA-TS 
 SEE RIVA TNT2 
 
-NAME Canopus SPECTRA 3200R2 
-SEE RIVA TNT 
-
-NAME Canopus SPECTRA 5400 
-SEE RIVA TNT2 
-
-NAME Canopus SPECTRA 5400 Premium Edition 
-SEE RIVA Ultra TNT2 
-
 NAME NVIDIA GeForce 256 (generic)
 SEE NVIDIA GeForce
 
@@ -2204,21 +2115,21 @@ LINE #Option "no_accel"
 NAME 3Dlabs Permedia4 (generic)
 DRIVER glint
 
-NAME ELSA GLoria-L/MX
+NAME Elsa GLoria-L/MX
 SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 
-NAME ELSA GLoria-L
+NAME Elsa GLoria-L
 SERVER 3DLabs
 DRIVER glint
 
-NAME ELSA GLoria-XL
+NAME Elsa GLoria-XL
 LINE Option     "SWcursor"
 SERVER 3DLabs
 DRIVER glint
 
-NAME ELSA GLoria-XXL
+NAME Elsa GLoria-XXL
 LINE Option     "SWcursor"
 SERVER 3DLabs
 DRIVER glint
@@ -2229,7 +2140,7 @@ SERVER 3DLabs
 DRIVER glint
 LINE Option "firegl_3000"
 
-NAME ELSA GLoria-S
+NAME Elsa GLoria-S
 SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
@@ -2243,13 +2154,13 @@ LINE #Option "no_accel"
 LINE #VideoRam 8192
 LINE Option     "SWcursor"
 
-NAME ELSA GLoria Synergy
+NAME Elsa GLoria Synergy
 SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
-NAME ELSA Winner 2000/Office
+NAME Elsa Winner 2000/Office
 SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
@@ -2261,12 +2172,6 @@ DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
-NAME Creative Blaster Exxtreme
-SERVER 3DLabs
-DRIVER glint
-LINE #Option "no_accel"
-LINE Option     "SWcursor"
-
 NAME AccelStar Permedia II AGP
 SERVER 3DLabs
 DRIVER glint
@@ -2278,7 +2183,7 @@ SERVER 3DLabs
 DRIVER glint
 LINE Option     "SWcursor"
 
-NAME 3DLabs Oxygen GMX
+NAME 3Dlabs Oxygen GMX
 SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
@@ -2337,7 +2242,7 @@ LINE Option "sw_cursor"
 
 # Epson SPC8110
 
-NAME EPSON SPC8110 (CardPC)
+NAME Epson SPC8110 (CardPC)
 SERVER SVGA
 DRIVER vga
 UNSUPPORTED
@@ -2365,9 +2270,6 @@ LINE # Option "sw_cursor"
 NAME Creative Labs 3D Blaster PCI (Verite 1000)
 SEE Rendition Verite 1000
 
-NAME Canopus Total-3D
-SEE Rendition Verite 1000
-
 NAME Sierra Screaming 3D
 SEE Rendition Verite 1000
 
@@ -2384,7 +2286,7 @@ SEE Rendition Verite 2x00
 
 # Epson
 
-NAME EPSON CardPC (onboard)
+NAME Epson CardPC (onboard)
 SERVER SVGA
 
 # Intel
@@ -2429,9 +2331,6 @@ SEE Intel 740 (generic)
 NAME ASUS AGP-V2740
 SEE Intel 740 (generic)
 
-NAME Atrend (Speedy) 3DIO740 AGP (ATC-2740)
-SEE Intel 740 (generic)
-
 NAME Chaintech AGP-740D
 SEE Intel 740 (generic)
 
@@ -2465,9 +2364,6 @@ SEE Intel 740 (generic)
 NAME Hercules Terminator 128 2X/i AGP
 SEE Intel 740 (generic)
 
-NAME HOT-158 (Shuttle)
-SEE Intel 740 (generic)
-
 NAME Intel Express 3D AGP
 SEE Intel 740 (generic)
 
@@ -2504,9 +2400,6 @@ SEE Intel 740 (generic)
 NAME Soyo AGP (SY-740 AGP)
 SEE Intel 740 (generic)
 
-NAME Spacewalker Hot-158 
-SEE Intel 740 (generic)
-
 NAME VideoExcel AGP 740
 SEE Intel 740 (generic)
 
@@ -2521,6 +2414,7 @@ SERVER SVGA
 DRIVER i810
 # UTAH_GLX  (not working)
 DRI_GLX
+LINE Option "XaaNoPixmapCache"
 
 NAME Intel 815
 SERVER SVGA
@@ -2575,27 +2469,27 @@ NAME Silicon Motion LynxEM
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI Lynx (generic)
+NAME Silicon Motion Lynx (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI LynxE (generic)
+NAME Silicon Motion LynxE (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI Lynx3D (generic)
+NAME Silicon Motion Lynx3D (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI LynxEM (generic)
+NAME Silicon Motion LynxEM (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI LynxEM+ (generic)
+NAME Silicon Motion LynxEM+ (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
-NAME SMI Lynx3DM (generic)
+NAME Silicon Motion Lynx3DM (generic)
 SERVER SVGA
 DRIVER siliconmotion
 
diff --git a/lst/Makefile b/lst/Makefile
index 59b0ef3b..05470b76 100644
--- a/lst/Makefile
+++ b/lst/Makefile
@@ -11,21 +11,16 @@ TMP_TABLES1 = $(TABLES1:%=%.tmp)
 TMP_TABLES2 = $(TABLES2:%=%.tmp)
 TMP_TABLES  = $(TABLES:%=%.tmp)
 
-build: CardsNames
+build: 
 
 clean:
-	rm -f *~ CardsNames *.tmp ScannerDB.gz
+	rm -f *~ *.tmp ScannerDB.gz
 
 check:
 	@../convert/merge2pcitable.pl pcitable pcitable pcitable > /dev/null
 	@../convert/merge2pcitable.pl pcitable usbtable usbtable > /dev/null
 	@cd ../convert; ./verify_Cards.pl
 
-CardsNames: Cards+ ../convert/Cards2CardsNames.pl
-	rm -f $@
-	../convert/Cards2CardsNames.pl $< > $@
-	chmod a-w $@
-
 $(TMP_TABLES1): %.tmp: %
 	../convert/merge2pcitable.pl pcitable $< $<.$(ARCH) > $@
 
@@ -45,4 +40,4 @@ install: $(TMP_TABLES) $(TABLES3)
 	 cat $$i.tmp \
 	) > $(dir)/$$i.d/90default.lst; done
 
-	install -m 644 ScannerDB.gz Cards+ CardsNames MonitorsDB isdn.db $(dir)
+	install -m 644 ScannerDB.gz Cards+ MonitorsDB isdn.db $(dir)
diff --git a/lst/pcitable b/lst/pcitable
index c754c23e..8e8d8cef 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -816,7 +816,7 @@
 0x1045	0xc935	"unknown"	"OPTi Inc.|EV1935 ECTIVA MachOne PCI Audio"
 0x1045	0xd568	"unknown"	"OPTi Inc.|82C825 [Firebridge 2]"
 0x1045	0xd768	"unknown"	"OPTi Inc.|82C750 Ultra DMA IDE controller"
-0x1048	0x0a32	"Card:ELSA GLoria Synergy"	"Elsa|Gloria Synergy"
+0x1048	0x0a32	"Card:Elsa GLoria Synergy"	"Elsa|Gloria Synergy"
 0x1048	0x0c60	"unknown"	"ELSA AG|Elsa Gladiac MX"
 0x1048	0x1000	"ISDN:hisax,type=18"	"Elsa AG|QuickStep 1000 ISDN Adapter"
 0x1048	0x3000	"ISDN:hisax,type=18"	"Elsa AG|QuickStep 3000 ISDN Adapter"
@@ -836,7 +836,7 @@
 0x104c	0x0508	"unknown"	"Texas Instruments|TMS380C2X Compressor Interface"
 0x104c	0x1000	"unknown"	"Texas Instruments|Eagle i/f AS"
 0x104c	0x3d04	"Card:3Dlabs Permedia2 (generic)"	"Texas Instruments|TVP4010 [Permedia]"
-0x104c	0x3d07	"Card:ELSA GLoria Synergy"	"Texas Instruments|ELSA GLoria Synergy [Permedia 2]"
+0x104c	0x3d07	"Card:Elsa GLoria Synergy"	"Texas Instruments|ELSA GLoria Synergy [Permedia 2]"
 0x104c	0x8000	"pcilynx"	"Texas Instruments|PCILynx/PCILynx2 IEEE 1394 Link Layer Controller"
 0x104c	0x8009	"unknown"	"Texas Instruments|OHCI Compliant FireWire Controller"
 0x104c	0x8011	"unknown"	"Texas Instruments|PCI4450 OHCI-Lynx IEEE 1394 Controller"
@@ -2341,13 +2341,13 @@
 0x1267	0x4243	"unknown"	"S.A. Telecommunications|Satellite receiver board / MPEG2 decoder"
 0x1267	0x5352	"unknown"	"S. A. Telecommunications|PCR2101"
 0x1267	0x5a4b	"unknown"	"S. A. Telecommunications|Telsat Turbo"
-0x126f	0x0710	"Card:SMI LynxEM (generic)"	"Silicon Motion, Inc.|Lynx EM MS710"
-0x126f	0x0712	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM712 LynxEM+"
-0x126f	0x0720	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM720 Lynx3DM"
-0x126f	0x0810	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM810"
-0x126f	0x0811	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM811 LynxE"
-0x126f	0x0820	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM820 Lynx3D"
-0x126f	0x0910	"Card:SMI Lynx (generic)"	"Silicon Motion, Inc.|SM910"
+0x126f	0x0710	"Card:Silicon Motion LynxEM (generic)"	"Silicon Motion, Inc.|Lynx EM MS710"
+0x126f	0x0712	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM712 LynxEM+"
+0x126f	0x0720	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM720 Lynx3DM"
+0x126f	0x0810	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM810"
+0x126f	0x0811	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM811 LynxE"
+0x126f	0x0820	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM820 Lynx3D"
+0x126f	0x0910	"Card:Silicon Motion Lynx (generic)"	"Silicon Motion, Inc.|SM910"
 0x1273	0x0002	"unknown"	"Hughes Network Systems|DirecPC"
 0x1274	0x0000	"unknown"	"Ensoniq|es1370 audio pci"
 0x1274	0x1371	"es1371"	"Ensoniq|ES1371 [AudioPCI-97]"
@@ -2974,24 +2974,24 @@
 0x3388	0x8012	"unknown"	"Hint Corp|VXPro II Chipset"
 0x3388	0x8013	"unknown"	"Hint Corp|VXPro II Chipset"
 0x3990	0x0007	"bttv"	"Hauppauge|WinTV-D"
-0x3d3d	0x0001	"Card:ELSA GLoria-S"	"3DLabs|GLINT 300SX"
-0x3d3d	0x0002	"Card:ELSA GLoria-L"	"3DLabs|GLINT 500TX"
-0x3d3d	0x0003	"Card:ELSA GLoria-S"	"3DLabs|GLINT Delta"
-0x3d3d	0x0004	"Card:ELSA GLoria-S"	"3DLabs|GLINT Permedia"
-0x3d3d	0x0005	"Card:ELSA GLoria-S"	"3DLabs|Permedia"
-0x3d3d	0x0006	"Card:ELSA GLoria-S"	"3DLabs|GLINT MX"
-0x3d3d	0x0007	"Card:ELSA GLoria-S"	"3DLabs|4D Extreme [GLINT Permedia 2]"
-0x3d3d	0x0008	"Card:ELSA GLoria-S"	"3DLabs|GLINT Gamma"
+0x3d3d	0x0001	"Card:Elsa GLoria-S"	"3DLabs|GLINT 300SX"
+0x3d3d	0x0002	"Card:Elsa GLoria-L"	"3DLabs|GLINT 500TX"
+0x3d3d	0x0003	"Card:Elsa GLoria-S"	"3DLabs|GLINT Delta"
+0x3d3d	0x0004	"Card:Elsa GLoria-S"	"3DLabs|GLINT Permedia"
+0x3d3d	0x0005	"Card:Elsa GLoria-S"	"3DLabs|Permedia"
+0x3d3d	0x0006	"Card:Elsa GLoria-S"	"3DLabs|GLINT MX"
+0x3d3d	0x0007	"Card:Elsa GLoria-S"	"3DLabs|4D Extreme [GLINT Permedia 2]"
+0x3d3d	0x0008	"Card:Elsa GLoria-S"	"3DLabs|GLINT Gamma"
 0x3d3d	0x0009	"Card:3Dlabs Permedia2 (generic)"	"3DLabs|Permedia II 2D+3D"
-0x3d3d	0x000a	"Card:ELSA GLoria-S"	"3DLabs|GLINT R3"
+0x3d3d	0x000a	"Card:Elsa GLoria-S"	"3DLabs|GLINT R3"
 0x3d3d	0x000c	"Card:3Dlabs Permedia4 (generic)"	"3DLabs|GLINT Permedia 4"
 0x3d3d	0x000d	"Card:3Dlabs Permedia4 (generic)"	"3DLabs|GLINT R4"
 0x3d3d	0x000e	"Card:3Dlabs Permedia4 (generic)"	"3DLabs|GLINT Gamma 2"
 0x3d3d	0x0011	"Card:3Dlabs Permedia4 (generic)"	"3DLabs|GLINT R4 (Alt)"
 0x3d3d	0x0100	"Card:3Dlabs Permedia2 (generic)"	"3DLabs|Permedia II 2D+3D"
-0x3d3d	0x1004	"Card:ELSA GLoria-S"	"3DLabs|Permedia"
-0x3d3d	0x3d04	"Card:ELSA GLoria-S"	"3DLabs|Permedia"
-0x3d3d	0xffff	"Card:ELSA GLoria-S"	"3DLabs|Glint VGA"
+0x3d3d	0x1004	"Card:Elsa GLoria-S"	"3DLabs|Permedia"
+0x3d3d	0x3d04	"Card:Elsa GLoria-S"	"3DLabs|Permedia"
+0x3d3d	0xffff	"Card:Elsa GLoria-S"	"3DLabs|Glint VGA"
 0x4005	0x0300	"unknown"	"Avance Logic Inc.|ALS300 PCI Audio Device"
 0x4005	0x0308	"unknown"	"Avance Logic Inc.|ALS300+ PCI Audio Device"
 0x4005	0x0309	"unknown"	"Avance Logic Inc.|PCI Input Controller"