diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-26 18:21:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-26 18:21:21 +0000 |
| commit | 983794e727ef7879e38a62c752e0acc9ad20e4c3 (patch) | |
| tree | 08f3b00cde860055979c55fe835ba9d4035d502a | |
| parent | d01afda68ac48d3314249d7e895cb94469728d6c (diff) | |
| download | ldetect-lst-983794e727ef7879e38a62c752e0acc9ad20e4c3.tar ldetect-lst-983794e727ef7879e38a62c752e0acc9ad20e4c3.tar.gz ldetect-lst-983794e727ef7879e38a62c752e0acc9ad20e4c3.tar.bz2 ldetect-lst-983794e727ef7879e38a62c752e0acc9ad20e4c3.tar.xz ldetect-lst-983794e727ef7879e38a62c752e0acc9ad20e4c3.zip | |
rollback bad commit
| -rwxr-xr-x | convert/merge2pcitable.pl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index d8f0a5ed..71f6fa91 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -11,9 +11,7 @@ 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::; @@ -263,7 +261,6 @@ 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") { |