diff -urN hwdata-0.158.orig/Cards hwdata-0.158/Cards --- hwdata-0.158.orig/Cards 2005-04-10 21:40:42.000000000 -0400 +++ hwdata-0.158/Cards 2005-11-16 09:32:09.000000000 -0500 @@ -3191,30 +3150,25 @@ DRIVER nv NOCLOCKPROBE -NAME RIVA TNT -CHIPSET RIVATNT -DRIVER nv +NAME NVIDIA (nvidia) +DRIVER nvidia NOCLOCKPROBE +NAME RIVA TNT +SEE NVIDIA (nvidia) + NAME RIVA TNT2 -CHIPSET RIVATNT2 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) # mharris - Nov 23, 2002 - Commented out the swcursor option, if it is still # needed, then lets disable it right in the driver completely, or possibly # fix it. # swcursor added to default configuration for bug #22173 NAME RIVA Ultra TNT2 -CHIPSET RIVA ULTRA TNT2 -DRIVER nv -LINE #Option "swcursor" -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce -CHIPSET GeForce -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME ELSA VICTORY ERAZOR SEE RIVA128 @@ -3226,19 +3180,19 @@ SEE RIVA128 NAME ELSA ERAZOR II -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME ELSA ERAZOR III -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME ELSA Synergy II -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Leadtek WinFast 3D S320II -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Leadtek WinFast 3D S320 -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME Leadtek WinFast 3D S3500 SEE RIVA128 @@ -3247,13 +3201,13 @@ SEE RIVA128 NAME Diamond Viper 550 -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME Diamond Viper 770 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME AOpen PS3010 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME STB Velocity 128 SEE RIVA128 @@ -3268,173 +3222,138 @@ SEE RIVA128 NAME Chaintech Desperado RI30 -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME Chaintech Desperado RI40/41 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Chaintech Desperado RI50 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Chaintech Desperado RI60 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Graphics Blaster TNT -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME Creative Graphics Blaster TNT2 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Hercules Dynamite TNT -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME MELCO WGA-TS -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Canopus SPECTRA 3200R2 -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME Canopus SPECTRA 5400 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME Canopus SPECTRA 5400 Premium Edition -SEE RIVA Ultra TNT2 +SEE NVIDIA (nvidia) NAME Guillemot Maxi Gamer Xentor 32 -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME NVIDIA Riva 128 (generic) SEE RIVA128 NAME NVIDIA Riva TNT (generic) -SEE RIVA TNT +SEE NVIDIA (nvidia) NAME NVIDIA Riva TNT2 (generic) -SEE RIVA TNT2 +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 256 (generic) -CHIPSET GeForce 256 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce DDR (generic) -CHIPSET GeForce DDR -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 2 (generic) -CHIPSET GeForce 2 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 2 MX (generic) -SEE NVIDIA GeForce 2 (generic) +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 2 GTS (generic) -SEE NVIDIA GeForce 2 (generic) +SEE NVIDIA (nvidia) -# Supported in XFree86 4.3.0 -# UNSUPPORTED by XFree86 4.2.1 and earlier NAME nVidia GeForce 2 Go -SEE NVIDIA GeForce 2 (generic) +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 3 (generic) -CHIPSET GeForce 3 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) # mharris - Nov 23, 2002 - enabling "nv" driver for GeForce 4 and Quadro 4 as # CVS XFree86 support them now in 4.2.99.2 NAME NVIDIA GeForce 4 (generic) -CHIPSET GeForce 4 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 4 MX (generic) -SEE NVIDIA GeForce 4 (generic) +SEE NVIDIA (nvidia) NAME NVIDIA Quadro 4 (generic) -CHIPSET Quadro 4 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce FX (generic) -CHIPSET GeForce FX -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA Quadro FX (generic) -CHIPSET Quadro FX -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6200 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6600 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6600 GT -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6610 XL -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6800 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6800 GT -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6800 LE -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce 6800 Ultra -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce FX 5100 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce FX 5500 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce Go 6600 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA GeForce Go 6600 TE/6200 TE -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) -NAME NVIDIA GeForce4 448 Go -DRIVER nv -NOCLOCKPROBE +NAME NVIDIA GeForce4 440 Go +SEE NVIDIA (nvidia) NAME NVIDIA Quadro FX 4000 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA Quadro FX 4400 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA Quadro FX 540 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA Quadro FX 700 -DRIVER nv -NOCLOCKPROBE +SEE NVIDIA (nvidia) NAME NVIDIA Quadro NVS 50 PCI DRIVER nv