summaryrefslogtreecommitdiffstats
path: root/convert
diff options
context:
space:
mode:
authorDexter Morgan <dmorgan@mageia.org>2011-05-17 10:04:07 +0000
committerDexter Morgan <dmorgan@mageia.org>2011-05-17 10:04:07 +0000
commit53deffa95a32e6d946b004c3e83bee0865a7c01d (patch)
treeeef2635b0ee8659b460d677205af47a777cc5554 /convert
parentf517e0fdddfadde37594b4e8806b2d8118b94349 (diff)
downloadldetect-lst-53deffa95a32e6d946b004c3e83bee0865a7c01d.tar
ldetect-lst-53deffa95a32e6d946b004c3e83bee0865a7c01d.tar.gz
ldetect-lst-53deffa95a32e6d946b004c3e83bee0865a7c01d.tar.bz2
ldetect-lst-53deffa95a32e6d946b004c3e83bee0865a7c01d.tar.xz
ldetect-lst-53deffa95a32e6d946b004c3e83bee0865a7c01d.zip
Sync with mandriva0.1.291
Diffstat (limited to 'convert')
-rwxr-xr-xconvert/merge2pcitable.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 6837f317..15ca92b9 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -42,7 +42,7 @@ if ($0 =~ /merge2pcitable/)
if ($format eq 'kernel_aliasmap' || $format eq 'fglrxko_pci_ids_h') {
foreach (keys %$d_pci) {
- if (member($d_pci->{$_}[0], ($ati_driver, $ati_driver_rhd, $ati_driver_vesa)) && !$d_in->{$_}[0]) {
+ if (member($d_pci->{$_}[0], ($ati_driver, $ati_driver_rhd, $ati_driver_vesa)) && !$d_in->{$_}) {
# support dropped, handle:
if ($d_pci->{$_}[0] eq $ati_driver) {
$d_pci->{$_}[0] = $ati_free_only;
@@ -53,7 +53,7 @@ if ($0 =~ /merge2pcitable/)
} else {
die 'not handled ' . $_;
}
- } elsif (member($d_pci->{$_}[0], ($ati_free_only, $ati_rhd_only)) && $d_in->{$_}[0]) {
+ } elsif (member($d_pci->{$_}[0], ($ati_free_only, $ati_rhd_only)) && $d_in->{$_}) {
# support added for pre-existing entry, handle:
if ($d_pci->{$_}[0] eq $ati_free_only) {
$d_pci->{$_}[0] = $ati_driver;
@@ -68,7 +68,7 @@ if ($0 =~ /merge2pcitable/)
# Here we hack around so that drivers get used in order radeon, radeonhd, vesa:
if ($format eq 'ati_pciids_csv') {
foreach (keys %$d_pci) {
- if (member($d_pci->{$_}[0], ($ati_driver, $ati_free_only)) && !$d_in->{$_}[0]) {
+ if (member($d_pci->{$_}[0], ($ati_driver, $ati_free_only)) && !$d_in->{$_}) {
# support dropped, handle:
if ($d_pci->{$_}[0] eq $ati_driver) {
$d_pci->{$_}[0] = $ati_driver_vesa;
@@ -77,7 +77,7 @@ if ($0 =~ /merge2pcitable/)
} else {
die 'not handled ' . $_;
}
- } elsif (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa, $ati_rhd_only)) && $d_in->{$_}[0]) {
+ } elsif (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa, $ati_rhd_only)) && $d_in->{$_}) {
# support added for pre-existing entry, handle:
next if $_ eq "10029610ffffffff"; # see Cards+ and #49824
if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa))) {
@@ -92,7 +92,7 @@ if ($0 =~ /merge2pcitable/)
}
if ($format eq 'rhd_id_c') {
foreach (keys %$d_pci) {
- if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_rhd_only)) && !$d_in->{$_}[0]) {
+ if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_rhd_only)) && !$d_in->{$_}) {
# support dropped, handle:
if ($d_pci->{$_}[0] eq $ati_driver_rhd) {
$d_pci->{$_}[0] = $ati_driver_vesa;
@@ -101,7 +101,7 @@ if ($0 =~ /merge2pcitable/)
} else {
die 'not handled ' . $_;
}
- } elsif ($d_pci->{$_}[0] eq $ati_driver_vesa && $d_in->{$_}[0]) {
+ } elsif ($d_pci->{$_}[0] eq $ati_driver_vesa && $d_in->{$_}) {
# support added for pre-existing entry, handle:
$d_pci->{$_}[0] = $ati_driver_rhd;
}