2 files changed, 1 insertions, 63 deletions
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index a4c59763e..475e35649 100644
--- a/v4l/scripts/cardlist
+++ b/v4l/scripts/cardlist
@@ -6,7 +6,7 @@ scripts/bttv.pl ../linux/drivers/media/video/bttv.h  ../linux/drivers/media/vide
 scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \
 	| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88
 
-./scripts/em2820.pl ../linux/drivers/usb/media/em2820.h ../linux/drivers/usb/media/em2820-cards.c \
+scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx.h ../linux/drivers/media/video/em28xx/em28xx-cards.c \
 	| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em2820
 cat ../linux/drivers/media/video/tuner-simple.c \
 	| grep "{ \"" \
diff --git a/v4l/scripts/em2820.pl b/v4l/scripts/em2820.pl
deleted file mode 100644
index 278dfc214..000000000
--- a/v4l/scripts/em2820.pl
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-my $new_entry = -1;
-my $nr = 0;
-my ($id,$subvendor,$subdevice);
-my %data;
-
-while (<>) {
-	# defines in header file
-	if (/#define\s+(EM2820_BOARD_\w+)\s+(\d+)/) {
-		$data{$1}->{nr} = $2;
-		next;
-	}
-	if (/#define\s+(EM2800_BOARD_\w+)\s+(\d+)/) {
-		$data{$1}->{nr} = $2;
-		next;
-	}
-	# em2820_boards
-	if (/\[(EM2820_BOARD_\w+)\]/) {
-		$id = $1;
-		$data{$id}->{id} = $id;
-		$data{$id}->{type} = "(em2820/em2840)";
-#		$data{$id}->{nr} = $nr++;
-	};
-	if (/\[(EM2800_BOARD_\w+)\]/) {
-		$id = $1;
-		$data{$id}->{id} = $id;
-		$data{$id}->{type} = "(em2800)";
-#		$data{$id}->{nr} = $nr++;
-	};
-
-	next unless defined($id);
-
-	if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info.*(EM2820_BOARD_\w+)/ ) {
-		$subvendor=$1;
-		$subdevice=$2;
-                push @{$data{$3}->{subid}}, "$subvendor:$subdevice";
-	}
-
-	if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info.*(EM2800_BOARD_\w+)/ ) {
-		$subvendor=$1;
-		$subdevice=$2;
-                push @{$data{$3}->{subid}}, "$subvendor:$subdevice";
-	}
-
-
-        if (!defined($data{$id}) || !defined($data{$id}->{name})) {
-                $data{$id}->{name} = $1 if (/\.name\s*=\s*\"([^\"]+)\"/);
-        }
-
-	# em2820_USB_tbl
-
-
-}
-
-foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) {
-	printf("%3d -> %-40s %-15s", $data{$item}->{nr}, $data{$item}->{name},$data{$item}->{type});
-	printf(" [%s]",join(",",@{$data{$item}->{subid}}))
-	  if defined($data{$item}->{subid});
-	print "\n";
-}