diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-03 11:20:08 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-03 11:20:08 +0000 |
| commit | 4cd9a330befb38a9f8315972845d515d966030a8 (patch) | |
| tree | 801b9683bdb95df3f451786e041b0cf88da5c79c /convert/merge2pcitable.pl | |
| parent | 5759cba4fe873f61ba7c121ca8dd5398d59bcc05 (diff) | |
| download | ldetect-lst-4cd9a330befb38a9f8315972845d515d966030a8.tar ldetect-lst-4cd9a330befb38a9f8315972845d515d966030a8.tar.gz ldetect-lst-4cd9a330befb38a9f8315972845d515d966030a8.tar.bz2 ldetect-lst-4cd9a330befb38a9f8315972845d515d966030a8.tar.xz ldetect-lst-4cd9a330befb38a9f8315972845d515d966030a8.zip | |
import missing description later
Diffstat (limited to 'convert/merge2pcitable.pl')
| -rwxr-xr-x | convert/merge2pcitable.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index 4ca54256..c756dcc5 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -260,9 +260,6 @@ sub write_pcitable { sub merge { my ($drivers, $new) = @_; - foreach (keys %$drivers) { - $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1]; - } foreach (keys %$new) { next if $new->{$_}[0] =~ /parport_pc|i810_ng/; if ($drivers->{$_}) { @@ -292,6 +289,9 @@ sub merge { if $all || /ffffffff$/ || $new->{$_}[0] ne "unknown"; } } + foreach (keys %$drivers) { + $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1]; + } } sub cleanup_subids { |