diff options
author | Anssi Hannula <anssi@mandriva.org> | 2010-09-03 07:07:21 +0000 |
---|---|---|
committer | Anssi Hannula <anssi@mandriva.org> | 2010-09-03 07:07:21 +0000 |
commit | d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6 (patch) | |
tree | 26b9bf1e136b7b0260db65f968cb2eda972ba1c3 /convert/merge2pcitable.pl | |
parent | 934ff4c97e0c3dd838be7ca4735e1fb6f5a236ff (diff) | |
download | ldetect-lst-d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6.tar ldetect-lst-d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6.tar.gz ldetect-lst-d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6.tar.bz2 ldetect-lst-d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6.tar.xz ldetect-lst-d2ac73e1754c431ae66cbdfc2bfd831d8a3b68f6.zip |
merge2pcitable: handle subsystem ids in NVIDIA README.txt
Diffstat (limited to 'convert/merge2pcitable.pl')
-rwxr-xr-x | convert/merge2pcitable.pl | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |