summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorVille Skytt\ä <ville.skytta@iki.fi>2006-01-09 15:25:38 -0200
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 15:25:38 -0200
commit12e66f6573beda52a434b757df5b7a5a05b9ebd2 (patch)
treea1b2473cb978be3d878673cfc8298a003c9e0475 /Documentation
parent90200d2b7f526128671a971ab29db38973bf3f51 (diff)
downloadlinux-3.10-12e66f6573beda52a434b757df5b7a5a05b9ebd2.tar.gz
linux-3.10-12e66f6573beda52a434b757df5b7a5a05b9ebd2.tar.bz2
linux-3.10-12e66f6573beda52a434b757df5b7a5a05b9ebd2.zip
V4L/DVB (3242): make the firmware dir docs consistent in the v4l-dvb tree.
- make the firmware dir documentation and comments consistent in the v4l-dvb tree. Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/dvb/avermedia.txt3
-rw-r--r--Documentation/dvb/get_dvb_firmware6
-rw-r--r--Documentation/dvb/ttusb-dec.txt3
3 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 2dc260b2b0a..068070ff13c 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -150,7 +150,8 @@ Getting the card going
The frontend module sp887x.o, requires an external firmware.
Please use the command "get_dvb_firmware sp887x" to download
- it. Then copy it to /usr/lib/hotplug/firmware.
+ it. Then copy it to /usr/lib/hotplug/firmware or /lib/firmware/
+ (depending on configuration of firmware hotplug).
Receiving DVB-T in Australia
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 08e96ff5572..4e5e6a979fe 100644
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -34,7 +34,11 @@ for ($i=0; $i < scalar(@components); $i++) {
if ($cid eq $components[$i]) {
$outfile = eval($cid);
die $@ if $@;
- print STDERR "Firmware $outfile extracted successfully. Now copy it to either /lib/firmware or /usr/lib/hotplug/firmware/ (depending on your hotplug version).\n";
+ print STDERR <<EOF;
+Firmware $outfile extracted successfully.
+Now copy it to either /usr/lib/hotplug/firmware or /lib/firmware
+(depending on configuration of firmware hotplug).
+EOF
exit(0);
}
}
diff --git a/Documentation/dvb/ttusb-dec.txt b/Documentation/dvb/ttusb-dec.txt
index 5c1e984c26a..b2f271cd784 100644
--- a/Documentation/dvb/ttusb-dec.txt
+++ b/Documentation/dvb/ttusb-dec.txt
@@ -41,4 +41,5 @@ Hotplug Firmware Loading for 2.6 kernels
For 2.6 kernels the firmware is loaded at the point that the driver module is
loaded. See linux/Documentation/dvb/firmware.txt for more information.
-Copy the three files downloaded above into the /usr/lib/hotplug/firmware directory.
+Copy the three files downloaded above into the /usr/lib/hotplug/firmware or
+/lib/firmware directory (depending on configuration of firmware hotplug).