summaryrefslogtreecommitdiffstats
path: root/convert/merge2pcitable.pl
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-08-03 11:14:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-08-03 11:14:21 +0000
commit5759cba4fe873f61ba7c121ca8dd5398d59bcc05 (patch)
tree52997a4aa1c9245c1a4e1f458045a003a7b64c67 /convert/merge2pcitable.pl
parentc782d6b7f9987764492c707e9eda0a4dde5643c1 (diff)
downloadldetect-lst-5759cba4fe873f61ba7c121ca8dd5398d59bcc05.tar
ldetect-lst-5759cba4fe873f61ba7c121ca8dd5398d59bcc05.tar.gz
ldetect-lst-5759cba4fe873f61ba7c121ca8dd5398d59bcc05.tar.bz2
ldetect-lst-5759cba4fe873f61ba7c121ca8dd5398d59bcc05.tar.xz
ldetect-lst-5759cba4fe873f61ba7c121ca8dd5398d59bcc05.zip
do not vivicate new devices (will look later why merge2pcitable.pl does not
find new devices from pci.ids)
Diffstat (limited to 'convert/merge2pcitable.pl')
-rwxr-xr-xconvert/merge2pcitable.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 01c78b07..4ca54256 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -260,8 +260,10 @@ sub write_pcitable {
sub merge {
my ($drivers, $new) = @_;
- foreach (keys %$new) {
+ foreach (keys %$drivers) {
$drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1];
+ }
+ foreach (keys %$new) {
next if $new->{$_}[0] =~ /parport_pc|i810_ng/;
if ($drivers->{$_}) {
if ($new->{$_}[0] ne "unknown") {