*** empty log message ***

3 files changed, 92 insertions, 143 deletions

diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index 5e1fea72..8d9a03de 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,6 @@
 %define name ldetect-lst
 %define version 0.1.2
-%define release 6mdk
+%define release 7mdk
 
 Name: %{name}
 Version: %{version}
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Thu Mar 15 2001 François Pons <fpons@mandrakesoft.com> 0.1.2-7mdk
+- updated, removed matrox memory reference.
+
 * Tue Mar 13 2001 Pixel <pixel@mandrakesoft.com> 0.1.2-6mdk
 - updated
 
diff --git a/lst/Cards+ b/lst/Cards+
index 7ca608d6..df922101 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -40,6 +40,7 @@ NAME Chips & Technologies CT65520
 CHIPSET ct65520
 SERVER SVGA
 DRIVER chips
+UNSUPPORTED
 LINE # Device section for C&T cards.
 LINE # Option "suspend_hack"
 LINE # Option "STN"
@@ -154,8 +155,8 @@ NAME Cirrus Logic GD542x
 CHIPSET CL-GD5420/2/4/6/8/9
 SERVER SVGA
 DRIVER vga
-UNSUPPORTED
 NOCLOCKPROBE
+UNSUPPORTED
 LINE # Device section for Cirrus Logic GD5420/2/4/6/8/9-based cards.
 LINE     #MemBase 0x00e00000
 LINE     #MemBase 0x04e00000
@@ -222,11 +223,12 @@ NAME Creative Labs Graphics Blaster 3D
 CHIPSET CL-GD5464
 SEE Cirrus Logic GD5464
 
-#tested
+# reported not working on SGI 1200 as of 02/22/2001 (RH)
 NAME Cirrus Logic GD5480
 CHIPSET CL-GD5480
 SERVER SVGA
 DRIVER cirrus
+UNSUPPORTED
 NOCLOCKPROBE
 
 #tested
@@ -630,7 +632,7 @@ DRIVER vga
 UNSUPPORTED
 NOCLOCKPROBE
 
-NAME S3 86C764 (generic)
+NAME S3 86C764 (Trio64)
 SEE S3 Trio64 (generic)
 
 NAME S3 Trio64V+ (generic)
@@ -640,7 +642,7 @@ DRIVER vga
 UNSUPPORTED
 NOCLOCKPROBE
 
-NAME S3 86C765 (generic)
+NAME S3 86C765 (Trio64V+)
 SEE S3 Trio64V+ (generic)
 
 NAME S3 Trio32 (generic)
@@ -808,10 +810,10 @@ SEE S3 Trio64V2 (generic)
 NAME S3 Trio64V2/GX (generic)
 SEE S3 Trio64V2 (generic)
 
-NAME S3 86C775 (generic)
+NAME S3 86C775 (Trio64V2/DX)
 SEE S3 Trio64V2/DX (generic)
 
-NAME S3 86C785 (generic)
+NAME S3 86C785 (Trio64V2/GX)
 SEE S3 Trio64V2/GX (generic)
 
 NAME ELSA WINNER 1000/T2D
@@ -829,7 +831,7 @@ NOCLOCKPROBE
 LINE     # Option "lcd_center"
 LINE     # Set_LCDClk  <pixel_clock_for_LCD>
 
-NAME S3 86CM65
+NAME S3 86CM65 (Aurora64V+)
 SEE S3 Aurora64V+ (generic)
 
 NAME SHARP 9080
@@ -1302,22 +1304,22 @@ NAME S3 Trio3D/2X
 LINE      # Option "no_accel"	# You may enable this if there are timeouts when starting X
 SEE S3 Trio3D
 
-NAME S3 86C325 (generic)
+NAME S3 86C325 (ViRGE)
 SEE S3 ViRGE (generic)
 
-NAME S3 86C375 (generic)
+NAME S3 86C375 (ViRGE/DX)
 SEE S3 ViRGE/DX (generic)
 
-NAME S3 86C385 (generic)
+NAME S3 86C385 (ViRGE/GX)
 SEE S3 ViRGE/GX (generic)
 
-NAME S3 86C357 (generic)
+NAME S3 86C357 (ViRGE/GX2)
 SEE S3 ViRGE/GX2 (generic)
 
-NAME S3 86C260 (generic)
+NAME S3 86C260 (ViRGE/MX)
 SEE S3 ViRGE/MX (generic)
 
-NAME S3 86C280 (generic)
+NAME S3 86C280 (ViRGE/MX+)
 SEE S3 ViRGE/MX+ (generic)
 
 
@@ -1412,7 +1414,7 @@ LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
 
-NAME S3 86C988 (generic)
+NAME S3 86C988 (ViRGE/VX)
 SEE S3 ViRGE/VX (generic)
 
 NAME ELSA Winner 3000
@@ -1520,7 +1522,8 @@ SERVER SVGA
 DRIVER savage
 NOCLOCKPROBE
 
-
+NAME S3 Savage/MX
+SEE S3 Savage4 (generic)
 
 # ET4000/ET6000
 
@@ -1573,6 +1576,10 @@ NAME ET6100 (generic)
 CHIPSET ET6100
 SEE ET6000 (generic)
 
+NAME ET6300 (generic)
+CHIPSET ET6300
+SEE ET6000 (generic)
+
 NAME Diamond Stealth 32
 CLOCKCHIP icd2061a
 NOCLOCKPROBE
@@ -1725,36 +1732,36 @@ SEE ET6000 (generic)
 NAME ATI 8514 Ultra (no VGA)
 CHIPSET ATI-Mach8
 SERVER Mach8
-DRIVER ati
+DRIVER vga
 UNSUPPORTED
 
 NAME ATI Graphics Ultra
-CHIPSET ATI-Mach8
+CHIPSET ati
 SERVER Mach8
 DRIVER ati
 
 NAME ATI Graphics Ultra Pro
-CHIPSET ATI-Mach32
+CHIPSET ati
 SERVER Mach32
 DRIVER ati
 
 NAME ATI Wonder SVGA
-CHIPSET ATI vgawonder
+CHIPSET ati
 SERVER SVGA
 DRIVER ati
 
 NAME ATI Ultra Plus
-CHIPSET ATI-Mach32
+CHIPSET ati
 SERVER Mach32
 DRIVER ati
 
 NAME ATI Mach32
-CHIPSET ATI-Mach32
+CHIPSET ati
 SERVER Mach32
 DRIVER ati
 
 NAME ATI Mach64
-CHIPSET ATI-Mach64
+CHIPSET ati
 SERVER Mach64
 DRIVER ati
 NOCLOCKPROBE
@@ -1861,13 +1868,21 @@ SEE ATI Mach64
 NAME ATI Rage Mobility P
 SEE ATI Mach64
 
-
 NAME ASUS PCI-V264CT
 SEE ATI Mach64
 
 NAME ASUS PCI-AV264CT
 SEE ATI Mach64
 
+NAME ATI Rage XL
+CHIPSET ati
+SERVER SVGA
+DRIVER ati
+NOCLOCKPROBE
+
+NAME ATI Rage XL AGP
+SEE ATI Rage XL
+
 NAME ATI Rage 128
 CHIPSET ATI Rage 128
 SERVER SVGA
@@ -1880,7 +1895,9 @@ LINE     #Option     "dac_8_bit"
 LINE     #Option     "dac_6_bit"
 
 NAME ATI Rage 128 Mobility
-SEE ATI Rage 128
+CHIPSET ati
+DRIVER r128
+NOCLOCKPROBE
 
 NAME ATI Rage Fury AGP
 SEE ATI Rage 128
@@ -1892,6 +1909,7 @@ NAME ATI XPERT 99 AGP
 SEE ATI Rage 128
 
 NAME ATI Radeon
+CHIPSET ati
 DRIVER radeon
 
 # AGX
@@ -2667,105 +2685,35 @@ DRIVER i128
 
 # Matrox
 
-NAME Matrox Millennium 2MB
+NAME Matrox Millennium
 CHIPSET mga2064w
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 2048
-NOCLOCKPROBE
-
-NAME Matrox Millennium 4MB
-CHIPSET mga2064w
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 4096
-NOCLOCKPROBE
-
-NAME Matrox Millennium 8MB
-CHIPSET mga2064w
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 8192
-NOCLOCKPROBE
-
-NAME Matrox Millennium II 4MB
-CHIPSET mga2164w
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 4096
-NOCLOCKPROBE
-
-NAME Matrox Millennium II 8MB
-CHIPSET mga2164w
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 8192
+UNSUPPORTED
+LINE Option	"sw_cursor"
 NOCLOCKPROBE
 
-NAME Matrox Millennium II 16MB
+NAME Matrox Millennium II
 CHIPSET mga2164w
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 16384
-NOCLOCKPROBE
-
-NAME Matrox Millennium G200 4MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 4096
 NOCLOCKPROBE
 
-NAME Matrox Millennium G200 8MB
+NAME Matrox Millennium G200
 CHIPSET mgag200
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 8192
 NOCLOCKPROBE
 
-NAME Matrox Millennium G200 16MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 16384
-NOCLOCKPROBE
-
-NAME Matrox Millennium G200 SD 4MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 4096
-LINE # Option "mga_sdram"
-NOCLOCKPROBE
-
-NAME Matrox Millennium G200 SD 8MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 8192
-LINE # Option "mga_sdram"
-NOCLOCKPROBE
-
-NAME Matrox Millennium G200 SD 16MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 16384
-LINE # Option "mga_sdram"
-NOCLOCKPROBE
-
-NAME Matrox Millennium G400 16MB
+NAME Matrox Millennium G400
 CHIPSET mgag400
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 16384
 NOCLOCKPROBE
 
-NAME Matrox Millennium G400 32MB
-CHIPSET mgag400
-SERVER SVGA
+NAME Matrox Millennium G450
+CHIPSET mgag450
 DRIVER mga
-LINE VideoRam 32768
 NOCLOCKPROBE
 
 NAME Matrox Mystique
@@ -2774,39 +2722,16 @@ SERVER SVGA
 DRIVER mga
 NOCLOCKPROBE
 
-NAME Matrox Mystique G200 4MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 4096
-NOCLOCKPROBE
-
-NAME Matrox Mystique G200 8MB
-CHIPSET mgag200
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 8192
-NOCLOCKPROBE
-
-NAME Matrox Mystique G200 16MB
+NAME Matrox Mystique G200
 CHIPSET mgag200
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 16384
 NOCLOCKPROBE
 
-NAME Matrox Productiva G100 4MB
+NAME Matrox Productiva G100
 CHIPSET mgag100
 SERVER SVGA
 DRIVER mga
-LINE VideoRam 4096
-NOCLOCKPROBE
-
-NAME Matrox Productiva G100 8MB
-CHIPSET mgag100
-SERVER SVGA
-DRIVER mga
-LINE VideoRam 8192
 NOCLOCKPROBE
 
 # NVIDIA
@@ -3159,14 +3084,14 @@ LINE #    Option     "fifo_conservative"
 NAME Rendition Verite 1000
 CHIPSET Verite 1000
 SERVER SVGA
-DRIVER rendition
+DRIVER vga
 UNSUPPORTED
 LINE # Option "sw_cursor"
 
 NAME Rendition Verite 2x00
 CHIPSET Verite 2x00
 SERVER SVGA
-DRIVER rendition
+DRIVER vga
 UNSUPPORTED
 LINE # Option "sw_cursor"
 
@@ -3356,23 +3281,29 @@ NAME Intel 810
 CHIPSET Intel 810
 SERVER SVGA
 DRIVER i810
+NOCLOCKPROBE
 
 NAME Intel 815
 CHIPSET Intel 815
 SERVER SVGA
 DRIVER i810
+NOCLOCKPROBE
 
 NAME Voodoo Banshee (generic)
 CHIPSET Voodoo Banshee
 SERVER SVGA
 DRIVER tdfx
-NOCLOCKPROBE
+
+NAME Voodoo Rush (generic)
+CHIPSET Voodoo Rush
+SERVER SVGA
+DRIVER tdfx
+LINE Option	"nodri"
 
 NAME Voodoo3 (generic)
 CHIPSET Voodoo3 
 SERVER SVGA
 DRIVER tdfx
-NOCLOCKPROBE
 
 NAME Voodoo5 (generic)
 CHIPSET Voodoo5
@@ -3391,6 +3322,21 @@ SEE Voodoo Banshee (generic)
 NAME Chaintech Desperado 3F10
 SEE Voodoo Banshee (generic)
 
+# Silicon Motion, Inc.
+
+NAME Silicon Motion Lynx (generic)
+CHIPSET Lynx
+SERVER SVGA
+DRIVER siliconmotion
+UNSUPPORTED
+NOCLOCKPROBE
+
+NAME Silicon Motion LynxEM
+CHIPSET Lynx
+SERVER SVGA
+DRIVER siliconmotion
+NOCLOCKPROBE
+
 NAME SMI Lynx (generic)
 CHIPSET Lynx
 SERVER SVGA
diff --git a/lst/pcitable b/lst/pcitable
index ef1abaff..67cee69c 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -433,21 +433,21 @@
 0x1028	0x0008	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
 0x102a	0x0000	"unknown"	"LSI Logic|HYDRA"
 0x102a	0x0010	"unknown"	"LSI Logic|ASPEN"
-0x102b	0x0010	"Card:Matrox Millennium 4MB"	"Matrox|MGA-I [Impression]"
-0x102b	0x0100	"Card:Matrox Millennium II 4MB"	"Matrox|Millennium II"
-0x102b	0x0518	"Card:Matrox Millennium II 4MB"	"Matrox|MGA-II [Athena]"
-0x102b	0x0519	"Card:Matrox Millennium 4MB"	"Matrox|MGA 2064W [Millennium]"
+0x102b	0x0010	"Card:Matrox Millennium"	"Matrox|MGA-I [Impression]"
+0x102b	0x0100	"Card:Matrox Millennium II"	"Matrox|Millennium II"
+0x102b	0x0518	"Card:Matrox Millennium II"	"Matrox|MGA-II [Athena]"
+0x102b	0x0519	"Card:Matrox Millennium"	"Matrox|MGA 2064W [Millennium]"
 0x102b	0x051a	"Card:Matrox Mystique"	"Matrox|MGA 1064SG [Mystique]"
-0x102b	0x051b	"Card:Matrox Millennium II 4MB"	"Matrox|MGA 2164W [Millennium II]"
+0x102b	0x051b	"Card:Matrox Millennium II"	"Matrox|MGA 2164W [Millennium II]"
 0x102b	0x051e	"Card:Matrox Mystique"	"Matrox|MGA 1064SG [Mystique] AGP"
-0x102b	0x051f	"Card:Matrox Millennium II 4MB"	"Matrox|MGA 2164W [Millennium II] AGP"
-0x102b	0x0520	"Card:Matrox Millennium G200 4MB"	"Matrox|MGA G200"
-0x102b	0x0521	"Card:Matrox Millennium G200 4MB"	"Matrox|MGA G200 AGP [Millennium] AGP"
+0x102b	0x051f	"Card:Matrox Millennium II"	"Matrox|MGA 2164W [Millennium II] AGP"
+0x102b	0x0520	"Card:Matrox Millennium G200"	"Matrox|MGA G200"
+0x102b	0x0521	"Card:Matrox Millennium G200"	"Matrox|MGA G200 AGP [Millennium] AGP"
 0x102b	0x0525	0x102b	0x0641	"Card:Matrox Millennium G450 (generic)"	"Matrox|MGA G450 AGP"
-0x102b	0x0525	"Card:Matrox Millennium G400 16MB"	"Matrox|MGA G400 AGP"
+0x102b	0x0525	"Card:Matrox Millennium G400"	"Matrox|MGA G400 AGP"
 0x102b	0x0d10	"Card:Matrox Mystique"	"Matrox|MGA Ultima/Impression"
-0x102b	0x1000	"Card:Matrox Productiva G100 4MB"	"Matrox|MGA G100 [Productiva]"
-0x102b	0x1001	"Card:Matrox Productiva G100 4MB"	"Matrox|MGA G100 [Productiva] AGP"
+0x102b	0x1000	"Card:Matrox Productiva G100"	"Matrox|MGA G100 [Productiva]"
+0x102b	0x1001	"Card:Matrox Productiva G100"	"Matrox|MGA G100 [Productiva] AGP"
 0x102b	0x1100	"Card:Matrox Mystique"	"Matrox|Mystique"
 0x102b	0x2007	"Card:Matrox Mystique"	"Matrox|MGA Mistral"
 0x102b	0x4536	"unknown"	"Matrox|VIA Framegrabber"