summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--tools/display_driver_helper1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 830713a..163895e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- disable debug output of display_driver_helper by default
+- fix ahead-of-X-server loading of proprietary and fglrx kernel modules
Version 0.93 - 17 April 2011
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index fb438f1..02dd482 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -198,6 +198,7 @@ check_xorg() {
local explicit_only="$2"
eval local xorg_drivers=\"\$XORG_$driver\"
+ [ -n "$xorg_drivers" ] || xorg_drivers="$driver"
eval local conflicts=\"\$CONFLICTS_$driver\"
get_xorg_drivers