diff -urN hwdata-knoppix-0.107.orig/Cards hwdata-knoppix-0.107/Cards
--- hwdata-knoppix-0.107.orig/Cards	2004-06-30 12:15:04.821517568 -0400
+++ hwdata-knoppix-0.107/Cards	2004-06-30 12:15:13.090260528 -0400
@@ -1995,103 +1995,89 @@
 
 NAME ATI Radeon 8500LE
 CHIPSET R200
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI FireGL 8700
 CHIPSET R200
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI FireGL 8800
 CHIPSET R200
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI Radeon 9000
 CHIPSET R250
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI Radeon 9000 Pro
 CHIPSET R250
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI Radeon 9100
 CHIPSET R250
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI Radeon Mobility M9
 CHIPSET R250
-DRIVER radeon
+DRIVER fglrx
 
 NAME ATI Radeon 9200
 CHIPSET R250
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9200SE
 CHIPSET R250
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9500
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9500 Pro
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9600
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9600 Pro
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9700
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9700 Pro
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9800
 CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI Radeon 9800 Pro
 CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI FireGL Z1/X1
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI FireGL X1
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 NAME ATI FireGL Z1
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 # No idea if this works or not.  I'm adding it here pointing to the vesa driver
 # for now (mharris Feb 10, 2002 - XFree86 4.2.99.901)
 NAME ATI Radeon Mobility U1
 CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+DRIVER fglrx
 
 
 
@@ -3068,7 +3054,7 @@
 
 NAME NVIDIA GeForce
 CHIPSET GeForce
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME ELSA VICTORY ERAZOR
@@ -3169,17 +3155,17 @@
 
 NAME NVIDIA GeForce 256 (generic)
 CHIPSET GeForce 256
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA GeForce DDR (generic)
 CHIPSET GeForce DDR
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA GeForce 2 (generic)
 CHIPSET GeForce 2
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA GeForce 2 MX (generic)
@@ -3195,14 +3181,14 @@
 
 NAME NVIDIA GeForce 3 (generic)
 CHIPSET GeForce 3
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 # 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
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA GeForce 4 MX (generic)
@@ -3210,17 +3196,17 @@
 
 NAME NVIDIA Quadro 4 (generic)
 CHIPSET Quadro 4
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA GeForce FX (generic)
 CHIPSET GeForce FX
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 NAME NVIDIA Quadro FX (generic)
 CHIPSET Quadro FX
-DRIVER nv
+DRIVER nvidia
 NOCLOCKPROBE
 
 #########################################################################