summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-12-27 13:07:35 +0000
committerMichael Krufky <devnull@localhost>2005-12-27 13:07:35 +0000
commit58915ac9386f618879a8e23f6816c100ed40fad6 (patch)
treeb069b224860051ac0258502ea52a7c7a500d359b /linux/drivers/media/dvb/ttpci
parente91f9666d58efcdb369ba1badbf494cd3249c354 (diff)
downloadmediapointer-dvb-s2-58915ac9386f618879a8e23f6816c100ed40fad6.tar.gz
mediapointer-dvb-s2-58915ac9386f618879a8e23f6816c100ed40fad6.tar.bz2
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>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
-rw-r--r--linux/drivers/media/dvb/ttpci/Kconfig3
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig
index fa7e38944..5b2aadb83 100644
--- a/linux/drivers/media/dvb/ttpci/Kconfig
+++ b/linux/drivers/media/dvb/ttpci/Kconfig
@@ -20,7 +20,8 @@ config DVB_AV7110
This driver needs an external firmware. Please use the script
"<kerneldir>/Documentation/dvb/get_dvb_firmware av7110" to
- download/extract it, and then copy it to /usr/lib/hotplug/firmware.
+ download/extract it, and then copy it to /usr/lib/hotplug/firmware
+ or /lib/firmware (depending on configuration of firmware hotplug).
Say Y if you own such a card and want to use it.
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 132d05101..bbe789665 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -1494,9 +1494,9 @@ static int get_firmware(struct av7110* av7110)
if (ret == -ENOENT) {
printk(KERN_ERR "dvb-ttpci: could not load firmware,"
" file not found: dvb-ttpci-01.fw\n");
- printk(KERN_ERR "dvb-ttpci: usually this should be in"
- " /usr/lib/hotplug/firmware\n");
- printk(KERN_ERR "dvb-ttpci: and can be downloaded here"
+ printk(KERN_ERR "dvb-ttpci: usually this should be in "
+ "/usr/lib/hotplug/firmware or /lib/firmware\n");
+ printk(KERN_ERR "dvb-ttpci: and can be downloaded from"
" http://www.linuxtv.org/download/dvb/firmware/\n");
} else
printk(KERN_ERR "dvb-ttpci: cannot request firmware"