From 5759cba4fe873f61ba7c121ca8dd5398d59bcc05 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 3 Aug 2004 11:14:21 +0000
Subject: do not vivicate new devices (will look later why merge2pcitable.pl
 does not find new devices from pci.ids)

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

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