From faf8d9bf045649c0155eee71cafd362bd5ec1fcf Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 5 Mar 2002 16:43:18 +0000
Subject: deactivate v4l module if DRI is enabled and r128 driver used.

---
 perl-install/Xconfigurator.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/Xconfigurator.pm')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 9da8234ea..234b2769a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1201,10 +1201,13 @@ Section "Module"
 
 # This loads the DBE extension module.
     Load	"dbe"
-
+);
+    unless ($o->{card}{DRI_glx} && $o->{card}{driver} eq 'r128') {
+	print G qq(
 # This loads the Video for Linux module.
     Load        "v4l"
 );
+    }
     if ($o->{card}{DRI_glx}) {
 	print G qq(
     Load	"glx"
-- 
cgit v1.2.1