Updated with data from Mandriva. There's still several thousand lines of changes to check over, but they'll have to wait until after 2008.0 Beta 2.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/hwdata/trunk@7 84bf7363-891f-0410-9a98-864156d94163

1 files changed, 10 insertions, 139 deletions

diff --git a/Cards b/Cards
index ea894ab..23b55a7 100644
--- a/Cards
+++ b/Cards
@@ -7,9 +7,6 @@ DRIVER glint
 NAME 3Dlabs Permedia4 (generic)
 DRIVER glint
 
-NAME AGX (generic)
-DRIVER vga
-
 NAME AT25
 DRIVER apm
 
@@ -56,21 +53,12 @@ SEE ATI Mach64
 NAME ATI Rage XL
 DRIVER ati
 
-NAME Alliance ProMotion 6422
-DRIVER vga
-
 NAME Ark Logic ARK1000PV (generic)
 DRIVER ark
 
 NAME Ark Logic ARK2000MT (generic)
 DRIVER ark
 
-NAME Avance Logic 2301
-DRIVER vga
-
-NAME Avance Logic 2302
-DRIVER vga
-
 NAME Chips & Technologies CT64300
 DRIVER chips
 LINE # Option "noaccel"
@@ -170,15 +158,6 @@ LINE #Option "fifo_conservative"
 NAME Cirrus Logic GD5480
 DRIVER cirrus
 
-NAME Cirrus Logic GD754x (laptop)
-DRIVER vga
-
-
-
-
-NAME Diamond Edge 3D
-DRIVER vga
-
 NAME Diamond SpeedStar 64
 SEE Cirrus Logic GD543x
 
@@ -192,7 +171,7 @@ NAME Diamond Viper 330
 SEE RIVA128
 
 NAME Diamond Viper 550
-SEE RIVA TNT
+SEE NVIDIA Legacy (71xx)
 
 NAME Diamond Viper PCI 2Mb
 DRIVER vga
@@ -321,41 +300,20 @@ DRIVER mga
 NAME MediaGX
 DRIVER cyrix
 
-NAME NVIDIA Legacy
-DRIVER nv
-
-NAME NVIDIA GeForce
-DRIVER nv
-
-NAME NVIDIA GeForce 256 (generic)
-SEE NVIDIA Legacy
-
-NAME NVIDIA GeForce FX (generic)
-SEE NVIDIA GeForce
-
-NAME NVIDIA GeForce2 (generic)
-SEE NVIDIA Legacy
+NAME NVIDIA Legacy (71xx)
+DRIVER nvidia
 
-NAME NVIDIA GeForce2 MX (generic)
-SEE NVIDIA GeForce
+NAME NVIDIA GeForce (96xx)
+DRIVER nvidia
 
-NAME NVIDIA GeForce3 (generic)
-SEE NVIDIA GeForce
+NAME NVIDIA GeForce (97xx+)
+DRIVER nvidia
 
-NAME NVIDIA GeForce3 (xbox)
+NAME NVIDIA GeForce (xbox)
 DRIVER nvxbox
 LINE Option "UseFBDev" "1"
 LINE Option "HWCursor" "0"
 
-NAME NVIDIA GeForce4 (generic)
-SEE NVIDIA GeForce
-
-NAME NVIDIA GeForce 6 Series
-SEE NVIDIA GeForce
-
-NAME NVIDIA GeForce 7 Series
-SEE NVIDIA GeForce
-
 NAME NeoMagic 128XD
 SEE NeoMagic MagicGraph (laptop/notebook)
 LINE     Option "XaaNoScanlineImageWriteRect"
@@ -397,17 +355,6 @@ DRIVER i128
 NAME Number Nine Imagine-128-T2R
 DRIVER i128
 
-NAME Paradise Accelerator Value
-DRIVER vga
-LINE Option "noaccel"        # ISA cards seem to have Color Expansion support broken
-LINE #Option "enable_bitblt" # This should work on ISA, but lets not make it default just in case.
-
-NAME RIVA TNT
-DRIVER nv
-
-NAME RIVA TNT2
-SEE NVIDIA Legacy
-
 NAME RIVA128
 DRIVER nv
 
@@ -515,15 +462,6 @@ SEE Cirrus Logic GD542x
 NAME STB Systems Velocity 3D
 SEE S3 ViRGE (generic)
 
-NAME SiS 300
-DRIVER sis
-
-NAME SiS 530
-DRIVER sis
-
-NAME SiS 540
-DRIVER sis
-
 NAME SiS 5597
 DRIVER sis
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -548,9 +486,6 @@ LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
 LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
 LINE                              # errors, but gives some accel
 
-NAME SiS 630
-DRIVER sis
-
 NAME SiS 6326
 DRIVER sis
 LINE     Option "sw_cursor"
@@ -564,12 +499,6 @@ LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
 LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
 LINE                              # errors, but gives some accel
 
-NAME SiS 650
-DRIVER sis
-
-NAME SiS Real256E
-DRIVER sis
-
 NAME SiS SG86C205
 DRIVER sis
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -605,66 +534,8 @@ DRIVER siliconmotion
 NAME Trident (generic)
 DRIVER trident
 
-NAME Trident 3DImage975 (generic)
-DRIVER trident
-
-NAME Trident 3DImage985 (generic)
-DRIVER trident
-
-NAME Trident 8900/9000 (generic)
-DRIVER trident
-
-NAME Trident Blade3D (generic)
-DRIVER trident
-
-NAME Trident Cyber 9320 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9382 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9385 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9388 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9397 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9397 DVD (generic)
-DRIVER trident
-
-NAME Trident Cyber 9520 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9525 (generic)
-DRIVER trident
-LINE     # Option "accel" # Use this if acceleration works on your laptop
-
-NAME Trident CyberBlade (generic)
-DRIVER trident
-
-NAME Trident TGUI9420DGi (generic)
-DRIVER trident
-
-NAME Trident TGUI9430DGi (generic)
-DRIVER trident
-
-NAME Trident TGUI9440 (generic)
-DRIVER trident
-
-NAME Trident TGUI9660 (generic)
-DRIVER trident
-
-NAME Trident TGUI9680 (generic)
-DRIVER trident
-
-NAME Trident TGUI9682 (generic)
-DRIVER trident
-
-NAME Trident TGUI9685 (generic)
-DRIVER trident
+NAME VGA driver (generic)
+DRIVER vga
 
 NAME VESA driver (generic)
 DRIVER vesa