From 02f686ae3e6ed8e75114b13565a7f97925e9b9e4 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Mon, 26 Jan 2015 00:17:40 +0200
Subject: merge2pcitable.pl: add support for nvidia driver 346+

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

(limited to 'convert')

diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 94be151f..7ad38383 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -397,7 +397,7 @@ sub read_nvidia_readme {
 	    next;
         }
 	next if /^\s+-+[\s-]+$/;
-	my ($description, $id, $subid) = /^\s+(.+?)\s+0x(....)(?: 0x(....))?/;
+	my ($description, $id) = /^\s+(.+?)\s+(?:0x)?([0-9A-Fa-f]{4})/;
 	$id = "10de" . lc($id);
 	# not really that useful (all subids belong to same generation anyway)
 	# and just causes more work when updating the lists
-- 
cgit v1.2.1