summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2015-01-26 00:17:40 +0200
committerAnssi Hannula <anssi@mageia.org>2015-01-26 00:17:40 +0200
commit02f686ae3e6ed8e75114b13565a7f97925e9b9e4 (patch)
tree17e819fc98ccd3609a3bfbbfa9340c6d6755622b
parentba9898b9718e491331727b39a8ab609cb88e2d33 (diff)
downloadldetect-lst-02f686ae3e6ed8e75114b13565a7f97925e9b9e4.tar
ldetect-lst-02f686ae3e6ed8e75114b13565a7f97925e9b9e4.tar.gz
ldetect-lst-02f686ae3e6ed8e75114b13565a7f97925e9b9e4.tar.bz2
ldetect-lst-02f686ae3e6ed8e75114b13565a7f97925e9b9e4.tar.xz
ldetect-lst-02f686ae3e6ed8e75114b13565a7f97925e9b9e4.zip
merge2pcitable.pl: add support for nvidia driver 346+
-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