summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rwxr-xr-xconvert/merge2pcitable.pl2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a452315a..facd5336 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- add GeForce FX series pci ids back (they are supported
by the nouveau driver)
+- merge2pcitable.pl: add support for nvidia driver 346+
Version 0.1.336 - 14 Dec 2014
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