summaryrefslogtreecommitdiffstats
path: root/convert
diff options
context:
space:
mode:
Diffstat (limited to 'convert')
-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") {