From 4cd9a330befb38a9f8315972845d515d966030a8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 3 Aug 2004 11:20:08 +0000
Subject: import missing description later

---
 convert/merge2pcitable.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'convert/merge2pcitable.pl')

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 {
-- 
cgit v1.2.1