diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /Documentation/dvb | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'Documentation/dvb')
-rw-r--r-- | Documentation/dvb/README.dvb-usb | 2 | ||||
-rw-r--r-- | Documentation/dvb/ci.txt | 2 | ||||
-rw-r--r-- | Documentation/dvb/faq.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index c8238e44ed6b..c4d963a67d6f 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
@@ -138,7 +138,7 @@ Hotplug is able to load the driver, when it is needed (because you plugged | |||
138 | in the device). | 138 | in the device). |
139 | 139 | ||
140 | If you want to enable debug output, you have to load the driver manually and | 140 | If you want to enable debug output, you have to load the driver manually and |
141 | from withing the dvb-kernel cvs repository. | 141 | from within the dvb-kernel cvs repository. |
142 | 142 | ||
143 | first have a look, which debug level are available: | 143 | first have a look, which debug level are available: |
144 | 144 | ||
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt index 4a0c2b56e690..6c3bda50f7dc 100644 --- a/Documentation/dvb/ci.txt +++ b/Documentation/dvb/ci.txt | |||
@@ -47,7 +47,7 @@ so on. | |||
47 | 47 | ||
48 | * CI modules that are supported | 48 | * CI modules that are supported |
49 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 49 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
50 | The CI module support is largely dependant upon the firmware on the cards | 50 | The CI module support is largely dependent upon the firmware on the cards |
51 | Some cards do support almost all of the available CI modules. There is | 51 | Some cards do support almost all of the available CI modules. There is |
52 | nothing much that can be done in order to make additional CI modules | 52 | nothing much that can be done in order to make additional CI modules |
53 | working with these cards. | 53 | working with these cards. |
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt index 121832e5d899..97b1373f2428 100644 --- a/Documentation/dvb/faq.txt +++ b/Documentation/dvb/faq.txt | |||
@@ -106,7 +106,7 @@ Some very frequently asked questions about linuxtv-dvb | |||
106 | 5. The dvb_net device doesn't give me any packets at all | 106 | 5. The dvb_net device doesn't give me any packets at all |
107 | 107 | ||
108 | Run tcpdump on the dvb0_0 interface. This sets the interface | 108 | Run tcpdump on the dvb0_0 interface. This sets the interface |
109 | into promiscous mode so it accepts any packets from the PID | 109 | into promiscuous mode so it accepts any packets from the PID |
110 | you have configured with the dvbnet utility. Check if there | 110 | you have configured with the dvbnet utility. Check if there |
111 | are any packets with the IP addr and MAC addr you have | 111 | are any packets with the IP addr and MAC addr you have |
112 | configured with ifconfig. | 112 | configured with ifconfig. |