From: Johannes Stezenbach <js@linuxtv.org>

o add OREN or51211, or51132_qam and or51132_vsb firmware
o correct some links

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/Documentation/dvb/contributors.txt |    3 +
 25-akpm/Documentation/dvb/get_dvb_firmware |   50 ++++++++++++++++++++++++++---
 25-akpm/Documentation/dvb/readme.txt       |    7 ++--
 3 files changed, 52 insertions(+), 8 deletions(-)

diff -puN Documentation/dvb/contributors.txt~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info Documentation/dvb/contributors.txt
--- 25/Documentation/dvb/contributors.txt~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info	2005-03-21 20:58:12.000000000 -0800
+++ 25-akpm/Documentation/dvb/contributors.txt	2005-03-21 20:58:12.000000000 -0800
@@ -72,5 +72,8 @@ Kenneth Aafløy <ke-aa@frisurf.no>
 Ernst Peinlich <e.peinlich@inode.at>
   for tuning/DiSEqC support for the DEC 3000-s
 
+Peter Beutner <p.beutner@gmx.net>
+  for the IR code for the ttusb-dec driver
+
 (If you think you should be in this list, but you are not, drop a
  line to the DVB mailing list)
diff -puN Documentation/dvb/get_dvb_firmware~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info Documentation/dvb/get_dvb_firmware
--- 25/Documentation/dvb/get_dvb_firmware~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info	2005-03-21 20:58:12.000000000 -0800
+++ 25-akpm/Documentation/dvb/get_dvb_firmware	2005-03-21 20:58:12.000000000 -0800
@@ -22,14 +22,15 @@ use File::Temp qw/ tempdir /;
 use IO::Handle;
 
 @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t",
-		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002" );
+		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002",
+		"or51211", "or51132_qam", "or51132_vsb");
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
 $cid = $ARGV[0];
 
 # Do it!
-for($i=0; $i < scalar(@components); $i++) {
+for ($i=0; $i < scalar(@components); $i++) {
     if ($cid eq $components[$i]) {
 	$outfile = eval($cid);
 	die $@ if $@;
@@ -122,9 +123,9 @@ sub tda10046 {
 }
 
 sub av7110 {
-    my $sourcefile = "dvb-ttpci-01.fw-261c";
-    my $url = "http://www.linuxtv.org/download/dvb/firmware/$sourcefile";
-    my $hash = "7b263de6b0b92d2347319c65adc7d4fb";
+    my $sourcefile = "dvb-ttpci-01.fw-261d";
+    my $url = "http://www.linuxtv.org/downloads/firmware/$sourcefile";
+    my $hash = "603431b6259715a8e88f376a53b64e2f";
     my $outfile = "dvb-ttpci-01.fw";
 
     checkstandard();
@@ -251,6 +252,45 @@ sub nxt2002 {
     $outfile;
 }
 
+sub or51211 {
+    my $fwfile = "dvb-fe-or51211.fw";
+    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
+    my $hash = "d830949c771a289505bf9eafc225d491";
+
+    checkstandard();
+
+    wgetfile($fwfile, $url);
+    verify($fwfile, $hash);
+
+    $fwfile;
+}
+
+sub or51132_qam {
+    my $fwfile = "dvb-fe-or51132-qam.fw";
+    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
+    my $hash = "7702e8938612de46ccadfe9b413cb3b5";
+
+    checkstandard();
+
+    wgetfile($fwfile, $url);
+    verify($fwfile, $hash);
+
+    $fwfile;
+}
+
+sub or51132_vsb {
+    my $fwfile = "dvb-fe-or51132-vsb.fw";
+    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
+    my $hash = "c16208e02f36fc439a557ad4c613364a";
+
+    checkstandard();
+
+    wgetfile($fwfile, $url);
+    verify($fwfile, $hash);
+
+    $fwfile;
+}
+
 # ---------------------------------------------------------------
 # Utilities
 
diff -puN Documentation/dvb/readme.txt~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info Documentation/dvb/readme.txt
--- 25/Documentation/dvb/readme.txt~dvb-oren-or51211-or51132_qam-and-or51132_vsb-firmware-download-info	2005-03-21 20:58:12.000000000 -0800
+++ 25-akpm/Documentation/dvb/readme.txt	2005-03-21 20:58:12.000000000 -0800
@@ -5,8 +5,9 @@ The main development site and CVS reposi
 drivers is http://linuxtv.org/.
 
 The developer mailing list linux-dvb is also hosted there,
-see http://linuxtv.org/mailinglists.xml. Please check
-the archive http://linuxtv.org/mailinglists/linux-dvb/
+see http://linuxtv.org/lists.php. Please check
+the archive http://linuxtv.org/pipermail/linux-dvb/
+and the Wiki http://linuxtv.org/wiki/
 before asking newbie questions on the list.
 
 API documentation, utilities and test/example programs
@@ -15,7 +16,7 @@ are available as part of the old driver 
 We plan to split this into separate packages, but it's not
 been done yet.
 
-http://linuxtv.org/download/dvb/
+http://linuxtv.org/downloads/
 
 What's inside this directory:
 
_