summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-05 16:43:18 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-05 16:43:18 +0000
commitfaf8d9bf045649c0155eee71cafd362bd5ec1fcf (patch)
tree6d73bfa983b0cc081cba692d280c4655ceba03ff
parent9b6fab8d709e193f5261236199f217937e63656a (diff)
downloaddrakx-backup-do-not-use-faf8d9bf045649c0155eee71cafd362bd5ec1fcf.tar
drakx-backup-do-not-use-faf8d9bf045649c0155eee71cafd362bd5ec1fcf.tar.gz
drakx-backup-do-not-use-faf8d9bf045649c0155eee71cafd362bd5ec1fcf.tar.bz2
drakx-backup-do-not-use-faf8d9bf045649c0155eee71cafd362bd5ec1fcf.tar.xz
drakx-backup-do-not-use-faf8d9bf045649c0155eee71cafd362bd5ec1fcf.zip
deactivate v4l module if DRI is enabled and r128 driver used.
-rw-r--r--perl-install/Xconfigurator.pm5
1 files changed, 4 insertions, 1 deletions
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"