From c8b6cb328a02edc92d9a8ba3acce7b7ed1219dc7 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Fri, 3 Sep 2010 07:26:01 +0000
Subject: merge2pcitable: allow overriding new nvidia_readme card assignments
 by an environment variable

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

(limited to 'convert')

diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 067ec4e2..6837f317 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -413,6 +413,7 @@ sub read_nvidia_readme {
     my ($f) = @_;
     my %drivers;
     my $section;
+    my $card = $ENV{NVIDIA_CARD} ? $ENV{NVIDIA_CARD} : "NVIDIA_UNKNOWN";
     foreach (cat_($f)) {
 	chomp;
 	last if $section > 3;
@@ -429,7 +430,7 @@ sub read_nvidia_readme {
 	my ($description, $id, $subid) = /^\s+(.+?)\s+0x(....)(?: 0x(....))?/;
 	$id = "10de" . lc($id);
 	$subid = $subid ? "10de" . lc($subid) : "ffffffff";
-	$drivers{$id . $subid} = [ 'Card:NVIDIA_UNKNOWN', $description ];
+	$drivers{$id . $subid} = [ "Card:$card", $description ];
     }
     \%drivers;
 }
-- 
cgit v1.2.1