diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-30 13:09:09 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-30 13:09:09 +0000 |
| commit | 6b9873501a473508cadf32dc10105d71f9d8be7b (patch) | |
| tree | 6bb64344861c6d1f868ecf9ac92f6d89a2329e2c | |
| parent | b3f2fa82f163fbdc0c546118f16551ecc98149af (diff) | |
| download | drakx-kbd-mouse-x11-6b9873501a473508cadf32dc10105d71f9d8be7b.tar drakx-kbd-mouse-x11-6b9873501a473508cadf32dc10105d71f9d8be7b.tar.gz drakx-kbd-mouse-x11-6b9873501a473508cadf32dc10105d71f9d8be7b.tar.bz2 drakx-kbd-mouse-x11-6b9873501a473508cadf32dc10105d71f9d8be7b.tar.xz drakx-kbd-mouse-x11-6b9873501a473508cadf32dc10105d71f9d8be7b.zip | |
"i810" is now "intel"
| -rw-r--r-- | lib/Xconfig/card.pm | 6 | ||||
| -rw-r--r-- | lib/Xconfig/various.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index 6dd8d23..2e40890 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -64,10 +64,10 @@ sub to_raw_X { if (arch() =~ /ppc/ && ($_->{Driver} eq 'r128' || $_->{Driver} eq 'radeon')) { $_->{UseFBDev} = 1; } - if ($_->{Driver} eq 'i810') { + if ($_->{Driver} eq 'intel') { $_->{Options}{May_Need_ForceBIOS} = '1'; } - if (member($_->{Driver}, qw(i810 ati))) { + if (member($_->{Driver}, qw(intel ati))) { $_->{Options}{XaaNoOffscreenPixmaps} = '1'; } } @@ -440,7 +440,7 @@ sub add_to_card__using_Cards { sub check_bad_card { my ($card) = @_; my $bad_card = $card->{BAD_FB_RESTORE}; - $bad_card ||= $card->{Driver} eq 'i810' || $card->{Driver} eq 'fbdev'; + $bad_card ||= $card->{Driver} eq 'intel' || $card->{Driver} eq 'fbdev'; $bad_card ||= member($card->{Driver}, 'nvidia', 'vmware') if !$::isStandalone; #- avoid testing during install at any price. log::explanations("the graphics card does not like X in framebuffer") if $bad_card; diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm index 356b48f..4e6b858 100644 --- a/lib/Xconfig/various.pm +++ b/lib/Xconfig/various.pm @@ -52,7 +52,7 @@ sub default { Composite => !($card->{Driver} eq 'fglrx' || $card->{Driver} eq 'nvidia' && $card->{DriverVersion} eq '71xx'), if_($card->{Driver} eq 'nvidia', RenderAccel => $card->{DriverVersion} eq '97xx', Clone => 0), if_($card->{Driver} eq 'savage', HWCursor => 1), - if_($card->{Driver} eq 'i810' && $isLaptop, Clone => 0), + if_($card->{Driver} eq 'intel' && $isLaptop, Clone => 0), if_($card->{Driver} eq 'ati' && $isLaptop, Clone => 1, BIOSHotkeys => 0), if_(exists $card->{DRI_GLX}, use_DRI_GLX => $card->{DRI_GLX} && !$card->{Xinerama}), if_(member($card->{Driver}, qw(i128 ati sis trident via savage)), EXA => 0), #- list taken from http://wiki.x.org/wiki/ExaStatus @@ -167,7 +167,7 @@ sub config { delete $card->{Options}{TwinView}; delete $card->{Options}{TwinViewOrientation}; } - } elsif ($card->{Driver} eq 'i810') { + } elsif ($card->{Driver} eq 'intel') { if ($various->{Clone}) { $card->{Options}{MonitorLayout} = 'NONE,CRT+LFP'; } else { |