Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...

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

diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 121832e..97b1373 100644 (file)
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -106,7 +106,7 @@ Some very frequently asked questions about linuxtv-dvb
 5. The dvb_net device doesn't give me any packets at all
 
        Run tcpdump on the dvb0_0 interface. This sets the interface
-       into promiscous mode so it accepts any packets from the PID
+       into promiscuous mode so it accepts any packets from the PID
        you have configured with the dvbnet utility. Check if there
        are any packets with the IP addr and MAC addr you have
        configured with ifconfig.