From 42f4ca7e81c18f6a96acc314ead3b65f16b33b52 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Thu, 14 Feb 2008 21:38:56 +0000
Subject: drop fglrx from blacklist, glxinfo hang has been fixed

---
 NEWS               | 2 ++
 lib/Xconfig/glx.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 01e9568..895b659 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- drop fglrx from blacklist, glxinfo hang has been fixed
+
 1.12:
 - blacklist fglrx driver (it makes glxinfo hang, #37269)
 
diff --git a/lib/Xconfig/glx.pm b/lib/Xconfig/glx.pm
index 1f3d89f..29644b1 100644
--- a/lib/Xconfig/glx.pm
+++ b/lib/Xconfig/glx.pm
@@ -102,7 +102,7 @@ sub parse_glxinfo {
     $glx_info;
 }
 
-my @glx_blacklist = qw(fglrx mga nv sis tdfx vboxvideo vesa vmware);
+my @glx_blacklist = qw(mga nv sis tdfx vboxvideo vesa vmware);
 
 sub is_in_metisse() {
     my $display = $ENV{DISPLAY};
-- 
cgit v1.2.1