From d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Fri, 3 Sep 2010 07:07:21 +0000
Subject: merge2pcitable: handle subsystem ids in NVIDIA README.txt

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

(limited to 'convert')

diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index b610e132..067ec4e2 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -426,8 +426,10 @@ sub read_nvidia_readme {
 	    next;
         }
 	next if /^\s+-+[\s-]+$/;
-	my ($description, $id) = /^\s+(.+)\s+0x(....)/;
-	$drivers{"10de" . lc($id) . "ffffffff"} = [ 'Card:NVIDIA_UNKNOWN', $description ];
+	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;
 }
-- 
cgit v1.2.1