Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...

[pandora-kernel.git] / Documentation / dvb / faq.txt

diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 25fae0b..121832e 100644 (file)
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -5,7 +5,7 @@ Some very frequently asked questions about linuxtv-dvb
        It's not a bug, it's a feature. Because the frontends have
        significant power requirements (and hence get very hot), they
        are powered down if they are unused (i.e. if the frontend device
-       is closed). The dvb-core.o module paramter "dvb_shutdown_timeout"
+       is closed). The dvb-core.o module parameter "dvb_shutdown_timeout"
        allow you to change the timeout (default 5 seconds). Setting the
        timeout to 0 disables the timeout feature.
 
@@ -76,7 +76,7 @@ Some very frequently asked questions about linuxtv-dvb
                the TuxBox CVS many interesting DVB applications and the dBox2
                DVB source
 
-       http://sourceforge.net/projects/dvbsak/
+       http://www.linuxtv.org/downloads/       
                DVB Swiss Army Knife library and utilities
 
        http://www.nenie.org/misc/mpsys/
@@ -150,7 +150,7 @@ Some very frequently asked questions about linuxtv-dvb
        - saa7146_vv: SAA7146 video and vbi functions. These are only needed
          for full-featured cards.
 
-       - video-buf: capture helper module for the saa7146_vv driver. This
+       - videobuf-dma-sg: capture helper module for the saa7146_vv driver. This
          one is responsible to handle capture buffers.
 
        - dvb-ttpci: The main driver for AV7110 based, full-featured