diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-26 18:18:55 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-26 18:18:55 +0000 |
| commit | d92f38fe67cf8abe14714afe06709e4f44a9ac3b (patch) | |
| tree | 5c6cf1b920a12d3443477a24657f0fdd7bc839f2 | |
| parent | 84fadf791431963ce251763007d685269ca5e175 (diff) | |
| download | ldetect-lst-d92f38fe67cf8abe14714afe06709e4f44a9ac3b.tar ldetect-lst-d92f38fe67cf8abe14714afe06709e4f44a9ac3b.tar.gz ldetect-lst-d92f38fe67cf8abe14714afe06709e4f44a9ac3b.tar.bz2 ldetect-lst-d92f38fe67cf8abe14714afe06709e4f44a9ac3b.tar.xz ldetect-lst-d92f38fe67cf8abe14714afe06709e4f44a9ac3b.zip | |
backport: handle devices which drivers declare them with PCI_ANY_ID
| -rwxr-xr-x | convert/merge2pcitable.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index 71f6fa91..d8f0a5ed 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -11,7 +11,9 @@ if ($0 =~ /merge2pcitable/) { $ARGV[0] eq '-f' and $force = shift; $ARGV[0] eq '-a' and $all = shift; + $ARGV[0] eq '--list-all' and $true_all = shift; $ARGV[0] eq '--keep-subids' and $keep_subids = shift; + $ARGV[0] eq '--descriptions' and $chk_descr = shift; my $formats = join '|', grep {$_} map { /^read_(.*)/ ? $1 : '' } keys %main::; @@ -261,6 +263,7 @@ sub merge { my ($drivers, $new) = @_; foreach (keys %$new) { + $drivers->{$_} ||= $new->{$_} if $true_all; next if $new->{$_}[0] =~ /parport_pc|i810_ng/; if ($drivers->{$_}) { if ($new->{$_}[0] ne "unknown") { |