disable fglrx & nvidia

they do not work with xserver-1.18...

2 files changed, 9 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index aae411af..ad21034f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- disable fglrx & nvidia
+  (do not work with xserver-1.18)
+
 Version 0.1.347 - 4 Oct 2015
 
 - update pci.ids and usb.ids
diff --git a/lst/Cards+ b/lst/Cards+
index ddd6b420..8106b529 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -159,7 +159,7 @@ NAME ATI Radeon HD 5000 to HD 6300 (radeon/fglrx)
 DRIVER ati
 FIRMWARE radeon-firmware
 DRI_GLX
-DRIVER2 fglrx
+#DRIVER2 fglrx
 
 # FireGL cards supported by proprietary driver and free 'radeon'
 # driver: update name as support changes
@@ -180,12 +180,12 @@ DRIVER ati
 FIRMWARE radeon-firmware
 DRIVER_NO_FIRMWARE vesa
 DRI_GLX
-DRIVER2 fglrx
+#DRIVER2 fglrx
 
 # Radeon cards supported by proprietary driver but not by free driver
 NAME ATI Radeon HD 5000 and later without free driver (vesa/fglrx)
 DRIVER vesa
-DRIVER2 fglrx
+#DRIVER2 fglrx
 
 # ARK Logic
 
@@ -265,13 +265,13 @@ DRIVER nouveau
 
 NAME NVIDIA GeForce 6100 to GeForce 7950
 DRIVER nouveau
-DRIVER2 nvidia304
+#DRIVER2 nvidia304
 #DRIVER2_NO_SSE nvidia96xx
 DRIVER2_NEEDS_SSE
 
 NAME NVIDIA GeForce 8100 to GeForce 415
 DRIVER nouveau
-DRIVER2 nvidia340
+#DRIVER2 nvidia340
 #DRIVER2_NO_SSE nvidia96xx
 DRIVER2_NEEDS_SSE
 
@@ -283,7 +283,7 @@ DRIVER2_NEEDS_SSE
 # supported by nvidia340.
 NAME NVIDIA GeForce 420 series and later
 DRIVER nouveau
-DRIVER2 nvidia-current
+#DRIVER2 nvidia-current
 DRIVER2_NEEDS_SSE
 
 NAME NVIDIA GeForce3 (xbox)