From 4362a9bbe0e5ceac9949843fb7134cacb049e9b5 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 2 Aug 2007 18:07:32 +0000
Subject: remove unused variables

---
 convert/merge2pcitable.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'convert/merge2pcitable.pl')

diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 9c6e3fee..6cc19147 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -7,7 +7,7 @@ my @ignored_modules = (
 qw(alsa ignore),
 );
 
-my ($force, @force_modules, $all, $true_all, $keep_subids, $chk_descr, $wildcards);
+my ($force, @force_modules, $all, $keep_subids, $wildcards);
 
 if ($0 =~ /merge2pcitable/) 
 {
@@ -322,7 +322,7 @@ sub write_pcitable {
 
 
 sub merge_entries_with_wildcards {
-    my ($drivers, $new, $classes) = @_;
+    my ($drivers, $classes) = @_;
     foreach (keys %$classes) {
         my ($vendor, $id, $subvendor, $subid);
         ($vendor, $id, $subvendor, $subid) = ($_ =~ /^([0-9a-f]{4,4})([0-9a-f]{4,4})/);
@@ -345,7 +345,7 @@ sub merge_entries_with_wildcards {
 
 sub merge {
     my ($drivers, $new, $classes) = @_;
-    merge_entries_with_wildcards($drivers, $new, $classes) if $wildcards;
+    merge_entries_with_wildcards($drivers, $classes) if $wildcards;
 
     foreach (keys %$new) {
 	next if $new->{$_}[0] =~ /parport_pc|i810_ng/;
-- 
cgit v1.2.1