summaryrefslogtreecommitdiffstats
path: root/convert/merge2pcitable.pl
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2012-04-05 19:00:45 +0000
committerAnssi Hannula <anssi@mageia.org>2012-04-05 19:00:45 +0000
commitac0f197059daa2481ddab278fd4db41ceb6b6ef1 (patch)
tree21e9d2e4508540263bdc269e03a002820665b245 /convert/merge2pcitable.pl
parent84fe39eccecc69f38f985ce9f5d2862e2ea6801e (diff)
downloadldetect-lst-ac0f197059daa2481ddab278fd4db41ceb6b6ef1.tar
ldetect-lst-ac0f197059daa2481ddab278fd4db41ceb6b6ef1.tar.gz
ldetect-lst-ac0f197059daa2481ddab278fd4db41ceb6b6ef1.tar.bz2
ldetect-lst-ac0f197059daa2481ddab278fd4db41ceb6b6ef1.tar.xz
ldetect-lst-ac0f197059daa2481ddab278fd4db41ceb6b6ef1.zip
merge2pcitable: simplify radeon hacks (noted by tv)
Diffstat (limited to 'convert/merge2pcitable.pl')
-rwxr-xr-xconvert/merge2pcitable.pl16
1 files changed, 4 insertions, 12 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index f7da9baa..8ccf4b85 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -50,13 +50,9 @@ if ($0 =~ /merge2pcitable/)
} else {
die 'not handled ' . $_;
}
- } elsif (member($d_pci->{$_}[0], ($ati_free_only)) && $d_in->{$_}) {
+ } elsif ($d_pci->{$_}[0] eq $ati_free_only && $d_in->{$_}) {
# support added for pre-existing entry, handle:
- if ($d_pci->{$_}[0] eq $ati_free_only) {
- $d_pci->{$_}[0] = $ati_driver;
- } else {
- die 'not handled ' . $_;
- }
+ $d_pci->{$_}[0] = $ati_driver;
}
}
}
@@ -72,13 +68,9 @@ if ($0 =~ /merge2pcitable/)
} else {
die 'not handled ' . $_;
}
- } elsif (member($d_pci->{$_}[0], ($ati_driver_vesa)) && $d_in->{$_}) {
+ } elsif ($d_pci->{$_}[0] eq $ati_driver_vesa && $d_in->{$_}) {
# support added for pre-existing entry, handle:
- if (member($d_pci->{$_}[0], ($ati_driver_vesa))) {
- $d_pci->{$_}[0] = (/^....(31..|3e..|4...|5...|7...|68..|94..|95..|961.|971.|98..)/) ? $ati_driver : $ati_driver_fw;
- } else {
- die 'not handled ' . $_;
- }
+ $d_pci->{$_}[0] = (/^....(31..|3e..|4...|5...|7...|68..|94..|95..|961.|971.|98..)/) ? $ati_driver : $ati_driver_fw;
}
}
}