summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/main.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-07-31 09:34:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-07-31 09:34:10 +0000
commit9111bc27d0c1988dedef66070416424fa9464fb2 (patch)
tree04941edda8000cb623e97b30374d6ba1b7bad027 /lib/Xconfig/main.pm
parent6e0e53f44ea1892db3333fca5289e8f199b5189c (diff)
downloaddrakx-kbd-mouse-x11-9111bc27d0c1988dedef66070416424fa9464fb2.tar
drakx-kbd-mouse-x11-9111bc27d0c1988dedef66070416424fa9464fb2.tar.gz
drakx-kbd-mouse-x11-9111bc27d0c1988dedef66070416424fa9464fb2.tar.bz2
drakx-kbd-mouse-x11-9111bc27d0c1988dedef66070416424fa9464fb2.tar.xz
drakx-kbd-mouse-x11-9111bc27d0c1988dedef66070416424fa9464fb2.zip
- drop support for installing/configuring 915resolution
(no more needed since x11-driver-video-intel 2.0)
Diffstat (limited to 'lib/Xconfig/main.pm')
-rw-r--r--lib/Xconfig/main.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index 6a4c8cf..a33ad56 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -35,9 +35,6 @@ sub configure_resolution {
card => Xconfig::card::from_raw_X($raw_X),
monitors => [ $raw_X->get_monitors ],
};
- if (my $rc = Xconfig::various::handle_May_Need_ForceBIOS($in, $raw_X)) {
- return $rc;
- }
$X->{resolutions} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitors}) or return;
if ($raw_X->is_modified) {
@@ -188,8 +185,7 @@ sub configure_everything_or_configure_chooser {
$raw_X = Xconfig::default::configure($in->do_pkgs, $o_keyboard, $o_mouse);
$rc = configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options);
} elsif (!$auto) {
- $rc = Xconfig::various::handle_May_Need_ForceBIOS($in, $raw_X);
- $rc ||= configure_chooser($in, $raw_X, $in->do_pkgs, $options);
+ $rc = configure_chooser($in, $raw_X, $in->do_pkgs, $options);
}
$rc && $raw_X, $rc;
}