diff options
author | Matt LaPlante <kernel1@cyberdogtech.com> | 2006-10-03 16:47:42 -0400 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-10-03 16:47:42 -0400 |
commit | fff9289b219f48cb2296714fea3d71f516991f9f (patch) | |
tree | 47f597d038f7304ac32066c263c289135a52b0c6 /Documentation | |
parent | 6c28f2c0f2054865d82b5a6b2164eac956f15c94 (diff) |
Fix typos in Documentation/: 'D'-'E'
This patch fixes typos in various Documentation txts. This patch addresses
some words starting with the letters 'D'-'E'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'Documentation')
38 files changed, 63 insertions, 64 deletions
diff --git a/Documentation/aoe/todo.txt b/Documentation/aoe/todo.txt index 7fee1e1165bc..c09dfad4aed8 100644 --- a/Documentation/aoe/todo.txt +++ b/Documentation/aoe/todo.txt | |||
@@ -7,7 +7,7 @@ not been observed, but it would be nice to eliminate any potential for | |||
7 | deadlock under memory pressure. | 7 | deadlock under memory pressure. |
8 | 8 | ||
9 | Because ATA over Ethernet is not fragmented by the kernel's IP code, | 9 | Because ATA over Ethernet is not fragmented by the kernel's IP code, |
10 | the destructore member of the struct sk_buff is available to the aoe | 10 | the destructor member of the struct sk_buff is available to the aoe |
11 | driver. By using a mempool for allocating all but the first few | 11 | driver. By using a mempool for allocating all but the first few |
12 | sk_buffs, and by registering a destructor, we should be able to | 12 | sk_buffs, and by registering a destructor, we should be able to |
13 | efficiently allocate sk_buffs without introducing any potential for | 13 | efficiently allocate sk_buffs without introducing any potential for |
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index f989a9e839b4..3646a0aaea82 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
@@ -1203,6 +1203,6 @@ temporarily map a bio into the virtual address space. | |||
1203 | and Linus' comments - Jan 2001) | 1203 | and Linus' comments - Jan 2001) |
1204 | 9.2 Discussions about kiobuf and bh design on lkml between sct, linus, alan | 1204 | 9.2 Discussions about kiobuf and bh design on lkml between sct, linus, alan |
1205 | et al - Feb-March 2001 (many of the initial thoughts that led to bio were | 1205 | et al - Feb-March 2001 (many of the initial thoughts that led to bio were |
1206 | brought up in this discusion thread) | 1206 | brought up in this discussion thread) |
1207 | 9.3 Discussions on mempool on lkml - Dec 2001. | 1207 | 9.3 Discussions on mempool on lkml - Dec 2001. |
1208 | 1208 | ||
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index 45a738b81501..f74affe5c829 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt | |||
@@ -80,7 +80,7 @@ the /proc filesystem entry which the "block" side of the driver creates as | |||
80 | the SCSI core may not yet be initialized (because the driver is a block | 80 | the SCSI core may not yet be initialized (because the driver is a block |
81 | driver) and attempting to register it with the SCSI core in such a case | 81 | driver) and attempting to register it with the SCSI core in such a case |
82 | would cause a hang. This is best done via an initialization script | 82 | would cause a hang. This is best done via an initialization script |
83 | (typically in /etc/init.d, but could vary depending on distibution). | 83 | (typically in /etc/init.d, but could vary depending on distribution). |
84 | For example: | 84 | For example: |
85 | 85 | ||
86 | for x in /proc/driver/cciss/cciss[0-9]* | 86 | for x in /proc/driver/cciss/cciss[0-9]* |
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt index 2b28e9ec4e3a..b61cb9564023 100644 --- a/Documentation/cputopology.txt +++ b/Documentation/cputopology.txt | |||
@@ -26,7 +26,7 @@ The type of **_id is int. | |||
26 | The type of siblings is cpumask_t. | 26 | The type of siblings is cpumask_t. |
27 | 27 | ||
28 | To be consistent on all architectures, the 4 attributes should have | 28 | To be consistent on all architectures, the 4 attributes should have |
29 | deafult values if their values are unavailable. Below is the rule. | 29 | default values if their values are unavailable. Below is the rule. |
30 | 1) physical_package_id: If cpu has no physical package id, -1 is the | 30 | 1) physical_package_id: If cpu has no physical package id, -1 is the |
31 | default value. | 31 | default value. |
32 | 2) core_id: If cpu doesn't support multi-core, its core id is 0. | 32 | 2) core_id: If cpu doesn't support multi-core, its core id is 0. |
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index addc67b1d770..682e1e7018f3 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
@@ -3205,7 +3205,7 @@ for a session; this includes virtual consoles, serial ports, and | |||
3205 | pseudoterminals (PTYs). | 3205 | pseudoterminals (PTYs). |
3206 | 3206 | ||
3207 | All terminal devices share a common set of capabilities known as line | 3207 | All terminal devices share a common set of capabilities known as line |
3208 | diciplines; these include the common terminal line dicipline as well | 3208 | disciplines; these include the common terminal line discipline as well |
3209 | as SLIP and PPP modes. | 3209 | as SLIP and PPP modes. |
3210 | 3210 | ||
3211 | All terminal devices are named similarly; this section explains the | 3211 | All terminal devices are named similarly; this section explains the |
@@ -3285,7 +3285,7 @@ port TTY, for which no alternate device would exist. | |||
3285 | Pseudoterminals (PTYs) | 3285 | Pseudoterminals (PTYs) |
3286 | 3286 | ||
3287 | Pseudoterminals, or PTYs, are used to create login sessions or provide | 3287 | Pseudoterminals, or PTYs, are used to create login sessions or provide |
3288 | other capabilities requiring a TTY line dicipline (including SLIP or | 3288 | other capabilities requiring a TTY line discipline (including SLIP or |
3289 | PPP capability) to arbitrary data-generation processes. Each PTY has | 3289 | PPP capability) to arbitrary data-generation processes. Each PTY has |
3290 | a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named | 3290 | a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named |
3291 | /dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by | 3291 | /dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by |
diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt index f21bec8c0a25..c7088c6d5df5 100644 --- a/Documentation/fb/sstfb.txt +++ b/Documentation/fb/sstfb.txt | |||
@@ -48,12 +48,12 @@ Module Usage | |||
48 | 48 | ||
49 | Module insertion: | 49 | Module insertion: |
50 | # insmod sstfb.o | 50 | # insmod sstfb.o |
51 | you should see some strange output frome the board: | 51 | you should see some strange output from the board: |
52 | a big blue square, a green and a red small squares and a vertical | 52 | a big blue square, a green and a red small squares and a vertical |
53 | white rectangle. why ? the function's name is self explanatory : | 53 | white rectangle. why? the function's name is self-explanatory: |
54 | "sstfb_test()"... | 54 | "sstfb_test()"... |
55 | (if you don't have a second monitor, you'll have to plug your monitor | 55 | (if you don't have a second monitor, you'll have to plug your monitor |
56 | directely to the 2D videocard to see what you're typing) | 56 | directly to the 2D videocard to see what you're typing) |
57 | # con2fb /dev/fbx /dev/ttyx | 57 | # con2fb /dev/fbx /dev/ttyx |
58 | bind a tty to the new frame buffer. if you already have a frame | 58 | bind a tty to the new frame buffer. if you already have a frame |
59 | buffer driver, the voodoo fb will likely be /dev/fb1. if not, | 59 | buffer driver, the voodoo fb will likely be /dev/fb1. if not, |
@@ -95,11 +95,11 @@ inverse=1 inverse Supposed to enable inverse console. | |||
95 | 95 | ||
96 | clipping=1 clipping Enable or disable clipping. | 96 | clipping=1 clipping Enable or disable clipping. |
97 | clipping=0 noclipping With clipping enabled, all offscreen | 97 | clipping=0 noclipping With clipping enabled, all offscreen |
98 | reads and writes are disgarded. | 98 | reads and writes are discarded. |
99 | Default: enable clipping. | 99 | Default: enable clipping. |
100 | 100 | ||
101 | gfxclk=x gfxclk:x Force graphic clock frequency (in MHz). | 101 | gfxclk=x gfxclk:x Force graphic clock frequency (in MHz). |
102 | Be carefull with this option, it may be | 102 | Be careful with this option, it may be |
103 | DANGEROUS. | 103 | DANGEROUS. |
104 | Default: auto | 104 | Default: auto |
105 | 50Mhz for Voodoo 1, | 105 | 50Mhz for Voodoo 1, |
diff --git a/Documentation/filesystems/dlmfs.txt b/Documentation/filesystems/dlmfs.txt index 9afab845a906..c50bbb2d52b4 100644 --- a/Documentation/filesystems/dlmfs.txt +++ b/Documentation/filesystems/dlmfs.txt | |||
@@ -68,7 +68,7 @@ request for an already acquired lock will not generate another DLM | |||
68 | call. Userspace programs are assumed to handle their own local | 68 | call. Userspace programs are assumed to handle their own local |
69 | locking. | 69 | locking. |
70 | 70 | ||
71 | Two levels of locks are supported - Shared Read, and Exlcusive. | 71 | Two levels of locks are supported - Shared Read, and Exclusive. |
72 | Also supported is a Trylock operation. | 72 | Also supported is a Trylock operation. |
73 | 73 | ||
74 | For information on the libo2dlm interface, please see o2dlm.h, | 74 | For information on the libo2dlm interface, please see o2dlm.h, |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 638cbd3d2b00..9175f44c9c64 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
@@ -390,7 +390,7 @@ stripes with parity, i.e. raid level 5, should not work, too. | |||
390 | 390 | ||
391 | You have to use the "persistent-superblock 0" option for each raid-disk in the | 391 | You have to use the "persistent-superblock 0" option for each raid-disk in the |
392 | NTFS volume/stripe you are configuring in /etc/raidtab as the persistent | 392 | NTFS volume/stripe you are configuring in /etc/raidtab as the persistent |
393 | superblock used by the MD driver would damange the NTFS volume. | 393 | superblock used by the MD driver would damage the NTFS volume. |
394 | 394 | ||
395 | Windows by default uses a stripe chunk size of 64k, so you probably want the | 395 | Windows by default uses a stripe chunk size of 64k, so you probably want the |
396 | "chunk-size 64k" option for each raid-disk, too. | 396 | "chunk-size 64k" option for each raid-disk, too. |
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt index 89b1d196ca80..4b5ca26e5048 100644 --- a/Documentation/filesystems/sysfs.txt +++ b/Documentation/filesystems/sysfs.txt | |||
@@ -238,7 +238,7 @@ Top Level Directory Layout | |||
238 | The sysfs directory arrangement exposes the relationship of kernel | 238 | The sysfs directory arrangement exposes the relationship of kernel |
239 | data structures. | 239 | data structures. |
240 | 240 | ||
241 | The top level sysfs diretory looks like: | 241 | The top level sysfs directory looks like: |
242 | 242 | ||
243 | block/ | 243 | block/ |
244 | bus/ | 244 | bus/ |
diff --git a/Documentation/hrtimers.txt b/Documentation/hrtimers.txt index 7620ff735faf..acad3a9b16c9 100644 --- a/Documentation/hrtimers.txt +++ b/Documentation/hrtimers.txt | |||
@@ -10,7 +10,7 @@ back and forth trying to integrate high-resolution and high-precision | |||
10 | features into the existing timer framework, and after testing various | 10 | features into the existing timer framework, and after testing various |
11 | such high-resolution timer implementations in practice, we came to the | 11 | such high-resolution timer implementations in practice, we came to the |
12 | conclusion that the timer wheel code is fundamentally not suitable for | 12 | conclusion that the timer wheel code is fundamentally not suitable for |
13 | such an approach. We initially didnt believe this ('there must be a way | 13 | such an approach. We initially didn't believe this ('there must be a way |
14 | to solve this'), and spent a considerable effort trying to integrate | 14 | to solve this'), and spent a considerable effort trying to integrate |
15 | things into the timer wheel, but we failed. In hindsight, there are | 15 | things into the timer wheel, but we failed. In hindsight, there are |
16 | several reasons why such integration is hard/impossible: | 16 | several reasons why such integration is hard/impossible: |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index c8f99a0a9077..3feb9f2f3682 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt | |||
@@ -30,7 +30,7 @@ is obtained by ORing 0x80 with the make code. | |||
30 | The special codes 0xF6 through 0xFF are reserved for use as follows: | 30 | The special codes 0xF6 through 0xFF are reserved for use as follows: |
31 | 0xF6 status report | 31 | 0xF6 status report |
32 | 0xF7 absolute mouse position record | 32 | 0xF7 absolute mouse position record |
33 | 0xF8-0xFB relative mouse position records(lsbs determind by | 33 | 0xF8-0xFB relative mouse position records (lsbs determined by |
34 | mouse button states) | 34 | mouse button states) |
35 | 0xFC time-of-day | 35 | 0xFC time-of-day |
36 | 0xFD joystick report (both sticks) | 36 | 0xFD joystick report (both sticks) |
diff --git a/Documentation/input/cs461x.txt b/Documentation/input/cs461x.txt index 6181747a14d8..afe0d6543e09 100644 --- a/Documentation/input/cs461x.txt +++ b/Documentation/input/cs461x.txt | |||
@@ -27,7 +27,7 @@ This driver have the basic support for PCI devices only; there is no | |||
27 | ISA or PnP ISA cards supported. AFAIK the ns558 have support for Crystal | 27 | ISA or PnP ISA cards supported. AFAIK the ns558 have support for Crystal |
28 | ISA and PnP ISA series. | 28 | ISA and PnP ISA series. |
29 | 29 | ||
30 | The driver works witn ALSA drivers simultaneously. For exmple, the xracer | 30 | The driver works with ALSA drivers simultaneously. For example, the xracer |
31 | uses joystick as input device and PCM device as sound output in one time. | 31 | uses joystick as input device and PCM device as sound output in one time. |
32 | There are no sound or input collisions detected. The source code have | 32 | There are no sound or input collisions detected. The source code have |
33 | comments about them; but I've found the joystick can be initialized | 33 | comments about them; but I've found the joystick can be initialized |
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt index c53b1c11aa40..085eb15b45b7 100644 --- a/Documentation/input/ff.txt +++ b/Documentation/input/ff.txt | |||
@@ -38,7 +38,7 @@ joystick.txt for details. | |||
38 | There is an utility called fftest that will allow you to test the driver. | 38 | There is an utility called fftest that will allow you to test the driver. |
39 | % fftest /dev/input/eventXX | 39 | % fftest /dev/input/eventXX |
40 | 40 | ||
41 | 3. Instructions to the developper | 41 | 3. Instructions to the developer |
42 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 42 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
43 | All interactions are done using the event API. That is, you can use ioctl() | 43 | All interactions are done using the event API. That is, you can use ioctl() |
44 | and write() on /dev/input/eventXX. | 44 | and write() on /dev/input/eventXX. |
diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index ac22f636e4c2..a8aa848f8656 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt | |||
@@ -154,7 +154,7 @@ about it. | |||
154 | 154 | ||
155 | 3.2 Event handlers | 155 | 3.2 Event handlers |
156 | ~~~~~~~~~~~~~~~~~~ | 156 | ~~~~~~~~~~~~~~~~~~ |
157 | Event handlers distrubite the events from the devices to userland and | 157 | Event handlers distribute the events from the devices to userland and |
158 | kernel, as needed. | 158 | kernel, as needed. |
159 | 159 | ||
160 | 3.2.1 keybdev | 160 | 3.2.1 keybdev |
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index 949f7b5a2053..e44855513b3d 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
@@ -51,7 +51,7 @@ more complex object types. It provides a set of basic fields that | |||
51 | almost all complex data types share. kobjects are intended to be | 51 | almost all complex data types share. kobjects are intended to be |
52 | embedded in larger data structures and replace fields they duplicate. | 52 | embedded in larger data structures and replace fields they duplicate. |
53 | 53 | ||
54 | 1.2 Defintion | 54 | 1.2 Definition |
55 | 55 | ||
56 | struct kobject { | 56 | struct kobject { |
57 | char name[KOBJ_NAME_LEN]; | 57 | char name[KOBJ_NAME_LEN]; |
diff --git a/Documentation/md.txt b/Documentation/md.txt index 13aa401aed69..154b4ff9bb35 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt | |||
@@ -62,7 +62,7 @@ be reconstructed (due to no parity). | |||
62 | 62 | ||
63 | For this reason, md will normally refuse to start such an array. This | 63 | For this reason, md will normally refuse to start such an array. This |
64 | requires the sysadmin to take action to explicitly start the array | 64 | requires the sysadmin to take action to explicitly start the array |
65 | desipite possible corruption. This is normally done with | 65 | despite possible corruption. This is normally done with |
66 | mdadm --assemble --force .... | 66 | mdadm --assemble --force .... |
67 | 67 | ||
68 | This option is not really available if the array has the root | 68 | This option is not really available if the array has the root |
@@ -214,8 +214,8 @@ All md devices contain: | |||
214 | safe_mode_delay | 214 | safe_mode_delay |
215 | When an md array has seen no write requests for a certain period | 215 | When an md array has seen no write requests for a certain period |
216 | of time, it will be marked as 'clean'. When another write | 216 | of time, it will be marked as 'clean'. When another write |
217 | request arrive, the array is marked as 'dirty' before the write | 217 | request arrives, the array is marked as 'dirty' before the write |
218 | commenses. This is known as 'safe_mode'. | 218 | commences. This is known as 'safe_mode'. |
219 | The 'certain period' is controlled by this file which stores the | 219 | The 'certain period' is controlled by this file which stores the |
220 | period as a number of seconds. The default is 200msec (0.200). | 220 | period as a number of seconds. The default is 200msec (0.200). |
221 | Writing a value of 0 disables safemode. | 221 | Writing a value of 0 disables safemode. |
diff --git a/Documentation/networking/NAPI_HOWTO.txt b/Documentation/networking/NAPI_HOWTO.txt index 54376e8249c1..93af3e87c65b 100644 --- a/Documentation/networking/NAPI_HOWTO.txt +++ b/Documentation/networking/NAPI_HOWTO.txt | |||
@@ -35,7 +35,7 @@ Legend: | |||
35 | packets out of the rx ring. Note from this that the lower the | 35 | packets out of the rx ring. Note from this that the lower the |
36 | load the more we could clean up the rxring | 36 | load the more we could clean up the rxring |
37 | "Ndone" == is the converse of "Done". Note again, that the higher | 37 | "Ndone" == is the converse of "Done". Note again, that the higher |
38 | the load the more times we couldnt clean up the rxring. | 38 | the load the more times we couldn't clean up the rxring. |
39 | 39 | ||
40 | Observe that: | 40 | Observe that: |
41 | when the NIC receives 890Kpackets/sec only 17 rx interrupts are generated. | 41 | when the NIC receives 890Kpackets/sec only 17 rx interrupts are generated. |
diff --git a/Documentation/networking/gen_stats.txt b/Documentation/networking/gen_stats.txt index c3297f79c137..ae54c828f4d6 100644 --- a/Documentation/networking/gen_stats.txt +++ b/Documentation/networking/gen_stats.txt | |||
@@ -103,8 +103,8 @@ In the kernel when setting up: | |||
103 | else | 103 | else |
104 | failed | 104 | failed |
105 | 105 | ||
106 | From now on, everytime you dump my_rate_est_stats it will contain | 106 | From now on, every time you dump my_rate_est_stats it will contain |
107 | uptodate info. | 107 | up-to-date info. |
108 | 108 | ||
109 | Once you are done, call gen_kill_estimator(my_basicstats, | 109 | Once you are done, call gen_kill_estimator(my_basicstats, |
110 | my_rate_est_stats) Make sure that my_basicstats and my_rate_est_stats | 110 | my_rate_est_stats) Make sure that my_basicstats and my_rate_est_stats |
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index c2f859f7f2f0..287b6227f1e9 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt | |||
@@ -147,7 +147,7 @@ Examples: | |||
147 | Example scripts | 147 | Example scripts |
148 | =============== | 148 | =============== |
149 | 149 | ||
150 | A collection of small tutorial scripts for pktgen is in expamples dir. | 150 | A collection of small tutorial scripts for pktgen is in examples dir. |
151 | 151 | ||
152 | pktgen.conf-1-1 # 1 CPU 1 dev | 152 | pktgen.conf-1-1 # 1 CPU 1 dev |
153 | pktgen.conf-1-2 # 1 CPU 2 dev | 153 | pktgen.conf-1-2 # 1 CPU 2 dev |
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt index c96897aa08b6..3e549fc90f91 100644 --- a/Documentation/networking/wan-router.txt +++ b/Documentation/networking/wan-router.txt | |||
@@ -570,7 +570,7 @@ bata1-2.2.1 Feb 09 2001 | |||
570 | 570 | ||
571 | Option to COMPILE WANPIPE modules against the currently | 571 | Option to COMPILE WANPIPE modules against the currently |
572 | running kernel, thus no need for manual kernel and module | 572 | running kernel, thus no need for manual kernel and module |
573 | re-compilatin. | 573 | re-compilation. |
574 | 574 | ||
575 | o Updates and Bug Fixes to wancfg utility. | 575 | o Updates and Bug Fixes to wancfg utility. |
576 | 576 | ||
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index 3cc953cb288f..719f9a9d60c0 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt | |||
@@ -11,7 +11,7 @@ Updated 2006 by Horms <horms@verge.net.au> | |||
11 | In order to use a diskless system, such as an X-terminal or printer server | 11 | In order to use a diskless system, such as an X-terminal or printer server |
12 | for example, it is necessary for the root filesystem to be present on a | 12 | for example, it is necessary for the root filesystem to be present on a |
13 | non-disk device. This may be an initramfs (see Documentation/filesystems/ | 13 | non-disk device. This may be an initramfs (see Documentation/filesystems/ |
14 | ramfs-rootfs-initramfs.txt), a ramdisk (see Documenation/initrd.txt) or a | 14 | ramfs-rootfs-initramfs.txt), a ramdisk (see Documentation/initrd.txt) or a |
15 | filesystem mounted via NFS. The following text describes on how to use NFS | 15 | filesystem mounted via NFS. The following text describes on how to use NFS |
16 | for the root filesystem. For the rest of this text 'client' means the | 16 | for the root filesystem. For the rest of this text 'client' means the |
17 | diskless system, and 'server' means the NFS server. | 17 | diskless system, and 'server' means the NFS server. |
diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt index 73fc87e5dc38..24edf25b3bb7 100644 --- a/Documentation/power/pci.txt +++ b/Documentation/power/pci.txt | |||
@@ -326,7 +326,7 @@ A reference implementation | |||
326 | 326 | ||
327 | This is a typical implementation. Drivers can slightly change the order | 327 | This is a typical implementation. Drivers can slightly change the order |
328 | of the operations in the implementation, ignore some operations or add | 328 | of the operations in the implementation, ignore some operations or add |
329 | more deriver specific operations in it, but drivers should do something like | 329 | more driver specific operations in it, but drivers should do something like |
330 | this on the whole. | 330 | this on the whole. |
331 | 331 | ||
332 | 5. Resources | 332 | 5. Resources |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index e80e03637a67..bfcd95dd3c36 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -335,7 +335,7 @@ struct boot_param_header { | |||
335 | "compact" format for the tree itself that is however not backward | 335 | "compact" format for the tree itself that is however not backward |
336 | compatible. You should always generate a structure of the highest | 336 | compatible. You should always generate a structure of the highest |
337 | version defined at the time of your implementation. Currently | 337 | version defined at the time of your implementation. Currently |
338 | that is version 16, unless you explicitely aim at being backward | 338 | that is version 16, unless you explicitly aim at being backward |
339 | compatible. | 339 | compatible. |
340 | 340 | ||
341 | - last_comp_version | 341 | - last_comp_version |
diff --git a/Documentation/rocket.txt b/Documentation/rocket.txt index a10678004451..2d11ad6e525a 100644 --- a/Documentation/rocket.txt +++ b/Documentation/rocket.txt | |||
@@ -107,7 +107,7 @@ second, third, and fourth Rocketport cards (if present) are set via | |||
107 | software control. The DIP switch settings for the I/O address must be | 107 | software control. The DIP switch settings for the I/O address must be |
108 | set to the value of the first Rocketport cards. | 108 | set to the value of the first Rocketport cards. |
109 | 109 | ||
110 | In order to destinguish each of the card from the others, each card | 110 | In order to distinguish each of the card from the others, each card |
111 | must have a unique board ID set on the dip switches. The first | 111 | must have a unique board ID set on the dip switches. The first |
112 | Rocketport board must be set with the DIP switches corresponding to | 112 | Rocketport board must be set with the DIP switches corresponding to |
113 | the first board, the second board must be set with the DIP switches | 113 | the first board, the second board must be set with the DIP switches |
@@ -120,7 +120,7 @@ conflict with any other cards in the system, including other | |||
120 | RocketPort cards. Below, you will find a list of commonly used I/O | 120 | RocketPort cards. Below, you will find a list of commonly used I/O |
121 | address ranges which may be in use by other devices in your system. | 121 | address ranges which may be in use by other devices in your system. |
122 | On a Linux system, "cat /proc/ioports" will also be helpful in | 122 | On a Linux system, "cat /proc/ioports" will also be helpful in |
123 | identifying what I/O addresses are being used by devics on your | 123 | identifying what I/O addresses are being used by devices on your |
124 | system. | 124 | system. |
125 | 125 | ||
126 | Remember, the FIRST RocketPort uses 68 I/O addresses. So, if you set it | 126 | Remember, the FIRST RocketPort uses 68 I/O addresses. So, if you set it |
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index a6555dbfa081..ffb74a1656e6 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt | |||
@@ -8,8 +8,8 @@ | |||
8 | Overview of Document: | 8 | Overview of Document: |
9 | ===================== | 9 | ===================== |
10 | This document is intended to give an good overview of how to debug | 10 | This document is intended to give an good overview of how to debug |
11 | Linux for s/390 & z/Architecture it isn't intended as a complete reference & not a | 11 | Linux for s/390 & z/Architecture. It isn't intended as a complete reference & not a |
12 | tutorial on the fundamentals of C & assembly, it dosen't go into | 12 | tutorial on the fundamentals of C & assembly. It doesn't go into |
13 | 390 IO in any detail. It is intended to complement the documents in the | 13 | 390 IO in any detail. It is intended to complement the documents in the |
14 | reference section below & any other worthwhile references you get. | 14 | reference section below & any other worthwhile references you get. |
15 | 15 | ||
@@ -354,7 +354,7 @@ static inline struct task_struct * get_current(void) | |||
354 | } | 354 | } |
355 | 355 | ||
356 | i.e. just anding the current kernel stack pointer with the mask -8192. | 356 | i.e. just anding the current kernel stack pointer with the mask -8192. |
357 | Thankfully because Linux dosen't have support for nested IO interrupts | 357 | Thankfully because Linux doesn't have support for nested IO interrupts |
358 | & our devices have large buffers can survive interrupts being shut for | 358 | & our devices have large buffers can survive interrupts being shut for |
359 | short amounts of time we don't need a separate stack for interrupts. | 359 | short amounts of time we don't need a separate stack for interrupts. |
360 | 360 | ||
@@ -394,7 +394,7 @@ i.e they aren't in registers & they aren't static. | |||
394 | back-chain: | 394 | back-chain: |
395 | This is a pointer to the stack pointer before entering a | 395 | This is a pointer to the stack pointer before entering a |
396 | framed functions ( see frameless function ) prologue got by | 396 | framed functions ( see frameless function ) prologue got by |
397 | deferencing the address of the current stack pointer, | 397 | dereferencing the address of the current stack pointer, |
398 | i.e. got by accessing the 32 bit value at the stack pointers | 398 | i.e. got by accessing the 32 bit value at the stack pointers |
399 | current location. | 399 | current location. |
400 | 400 | ||
@@ -724,7 +724,7 @@ This is useful for debugging because | |||
724 | 1) You can double check whether the files you expect to be included are the ones | 724 | 1) You can double check whether the files you expect to be included are the ones |
725 | that are being included ( e.g. double check that you aren't going to the i386 asm directory ). | 725 | that are being included ( e.g. double check that you aren't going to the i386 asm directory ). |
726 | 2) Check that macro definitions aren't clashing with typedefs, | 726 | 2) Check that macro definitions aren't clashing with typedefs, |
727 | 3) Check that definitons aren't being used before they are being included. | 727 | 3) Check that definitions aren't being used before they are being included. |
728 | 4) Helps put the line emitting the error under the microscope if it contains macros. | 728 | 4) Helps put the line emitting the error under the microscope if it contains macros. |
729 | 729 | ||
730 | For convenience the Linux kernel's makefile will do preprocessing automatically for you | 730 | For convenience the Linux kernel's makefile will do preprocessing automatically for you |
@@ -840,12 +840,11 @@ using the strip command to make it a more reasonable size to boot it. | |||
840 | 840 | ||
841 | A source/assembly mixed dump of the kernel can be done with the line | 841 | A source/assembly mixed dump of the kernel can be done with the line |
842 | objdump --source vmlinux > vmlinux.lst | 842 | objdump --source vmlinux > vmlinux.lst |
843 | Also if the file isn't compiled -g this will output as much debugging information | 843 | Also, if the file isn't compiled -g, this will output as much debugging information |
844 | as it can ( e.g. function names ), however, this is very slow as it spends lots | 844 | as it can (e.g. function names). This is very slow as it spends lots |
845 | of time searching for debugging info, the following self explanitory line should be used | 845 | of time searching for debugging info. The following self explanatory line should be used |
846 | instead if the code isn't compiled -g. | 846 | instead if the code isn't compiled -g, as it is much faster: |
847 | objdump --disassemble-all --syms vmlinux > vmlinux.lst | 847 | objdump --disassemble-all --syms vmlinux > vmlinux.lst |
848 | as it is much faster | ||
849 | 848 | ||
850 | As hard drive space is valuble most of us use the following approach. | 849 | As hard drive space is valuble most of us use the following approach. |
851 | 1) Look at the emitted psw on the console to find the crash address in the kernel. | 850 | 1) Look at the emitted psw on the console to find the crash address in the kernel. |
@@ -1674,8 +1673,8 @@ channel is idle & the second for device end ( secondary status ) sometimes you g | |||
1674 | concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each interrupt, | 1673 | concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each interrupt, |
1675 | from which you receive an Interruption response block (IRB). If you get channel & device end | 1674 | from which you receive an Interruption response block (IRB). If you get channel & device end |
1676 | status in the IRB without channel checks etc. your IO probably went okay. If you didn't you | 1675 | status in the IRB without channel checks etc. your IO probably went okay. If you didn't you |
1677 | probably need a doctorto examine the IRB & extended status word etc. | 1676 | probably need a doctor to examine the IRB & extended status word etc. |
1678 | If an error occurs more sophistocated control units have a facitity known as | 1677 | If an error occurs, more sophistocated control units have a facitity known as |
1679 | concurrent sense this means that if an error occurs Extended sense information will | 1678 | concurrent sense this means that if an error occurs Extended sense information will |
1680 | be presented in the Extended status word in the IRB if not you have to issue a | 1679 | be presented in the Extended status word in the IRB if not you have to issue a |
1681 | subsequent SENSE CCW command after the test subchannel. | 1680 | subsequent SENSE CCW command after the test subchannel. |
@@ -1916,7 +1915,7 @@ Assembly | |||
1916 | -------- | 1915 | -------- |
1917 | info registers: displays registers other than floating point. | 1916 | info registers: displays registers other than floating point. |
1918 | info all-registers: displays floating points as well. | 1917 | info all-registers: displays floating points as well. |
1919 | disassemble: dissassembles | 1918 | disassemble: disassembles |
1920 | e.g. | 1919 | e.g. |
1921 | disassemble without parameters will disassemble the current function | 1920 | disassemble without parameters will disassemble the current function |
1922 | disassemble $pc $pc+10 | 1921 | disassemble $pc $pc+10 |
@@ -1935,7 +1934,7 @@ undisplay : undo's display's | |||
1935 | 1934 | ||
1936 | info breakpoints: shows all current breakpoints | 1935 | info breakpoints: shows all current breakpoints |
1937 | 1936 | ||
1938 | info stack: shows stack back trace ( if this dosent work too well, I'll show you the | 1937 | info stack: shows stack back trace ( if this doesn't work too well, I'll show you the |
1939 | stacktrace by hand below ). | 1938 | stacktrace by hand below ). |
1940 | 1939 | ||
1941 | info locals: displays local variables. | 1940 | info locals: displays local variables. |
diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt index 079d8868ae83..3746b6d7b4ba 100644 --- a/Documentation/s390/cds.txt +++ b/Documentation/s390/cds.txt | |||
@@ -433,7 +433,7 @@ puts the CPU into I/O disabled state by preserving the current PSW flags. | |||
433 | 433 | ||
434 | The device driver is allowed to issue the next ccw_device_start() call from | 434 | The device driver is allowed to issue the next ccw_device_start() call from |
435 | within its interrupt handler already. It is not required to schedule a | 435 | within its interrupt handler already. It is not required to schedule a |
436 | bottom-half, unless an non deterministicly long running error recovery procedure | 436 | bottom-half, unless an non deterministically long running error recovery procedure |
437 | or similar needs to be scheduled. During I/O processing the Linux/390 generic | 437 | or similar needs to be scheduled. During I/O processing the Linux/390 generic |
438 | I/O device driver support has already obtained the IRQ lock, i.e. the handler | 438 | I/O device driver support has already obtained the IRQ lock, i.e. the handler |
439 | must not try to obtain it again when calling ccw_device_start() or we end in a | 439 | must not try to obtain it again when calling ccw_device_start() or we end in a |
diff --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt index e321a8ed2a2d..5ff6fe551b93 100644 --- a/Documentation/s390/s390dbf.txt +++ b/Documentation/s390/s390dbf.txt | |||
@@ -468,7 +468,7 @@ The hex_ascii view shows the data field in hex and ascii representation | |||
468 | The raw view returns a bytestream as the debug areas are stored in memory. | 468 | The raw view returns a bytestream as the debug areas are stored in memory. |
469 | 469 | ||
470 | The sprintf view formats the debug entries in the same way as the sprintf | 470 | The sprintf view formats the debug entries in the same way as the sprintf |
471 | function would do. The sprintf event/expection functions write to the | 471 | function would do. The sprintf event/exception functions write to the |
472 | debug entry a pointer to the format string (size = sizeof(long)) | 472 | debug entry a pointer to the format string (size = sizeof(long)) |
473 | and for each vararg a long value. So e.g. for a debug entry with a format | 473 | and for each vararg a long value. So e.g. for a debug entry with a format |
474 | string plus two varargs one would need to allocate a (3 * sizeof(long)) | 474 | string plus two varargs one would need to allocate a (3 * sizeof(long)) |
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index fb9281ae8faa..e80a02cffb22 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt | |||
@@ -96,10 +96,10 @@ The original driver has been written for 386bsd and FreeBSD by: | |||
96 | It is now available as a bundle of 2 drivers: | 96 | It is now available as a bundle of 2 drivers: |
97 | 97 | ||
98 | - ncr53c8xx generic driver that supports all the SYM53C8XX family including | 98 | - ncr53c8xx generic driver that supports all the SYM53C8XX family including |
99 | the ealiest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and | 99 | the earliest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and |
100 | the new 895A (1 channel LVD SCSI controller). | 100 | the new 895A (1 channel LVD SCSI controller). |
101 | - sym53c8xx enhanced driver (a.k.a. 896 drivers) that drops support of oldest | 101 | - sym53c8xx enhanced driver (a.k.a. 896 drivers) that drops support of oldest |
102 | chips in order to gain advantage of new features, as LOAD/STORE intructions | 102 | chips in order to gain advantage of new features, as LOAD/STORE instructions |
103 | available since the 810A and hardware phase mismatch available with the | 103 | available since the 810A and hardware phase mismatch available with the |
104 | 896 and the 895A. | 104 | 896 and the 895A. |
105 | 105 | ||
@@ -207,7 +207,7 @@ The 896 and the 895A allows handling of the phase mismatch context from | |||
207 | SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor | 207 | SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor |
208 | until the C code has saved the context of the transfer). | 208 | until the C code has saved the context of the transfer). |
209 | Implementing this without using LOAD/STORE instructions would be painfull | 209 | Implementing this without using LOAD/STORE instructions would be painfull |
210 | and I did'nt even want to try it. | 210 | and I didn't even want to try it. |
211 | 211 | ||
212 | The 896 chip supports 64 bit PCI transactions and addressing, while the | 212 | The 896 chip supports 64 bit PCI transactions and addressing, while the |
213 | 895A supports 32 bit PCI transactions and 64 bit addressing. | 213 | 895A supports 32 bit PCI transactions and 64 bit addressing. |
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt index ce767b90bb0d..8d6253f9cb32 100644 --- a/Documentation/scsi/scsi_eh.txt +++ b/Documentation/scsi/scsi_eh.txt | |||
@@ -160,7 +160,7 @@ ways. | |||
160 | - Fine-grained EH callbacks | 160 | - Fine-grained EH callbacks |
161 | LLDD can implement fine-grained EH callbacks and let SCSI | 161 | LLDD can implement fine-grained EH callbacks and let SCSI |
162 | midlayer drive error handling and call appropriate callbacks. | 162 | midlayer drive error handling and call appropriate callbacks. |
163 | This will be dicussed further in [2-1]. | 163 | This will be discussed further in [2-1]. |
164 | 164 | ||
165 | - eh_strategy_handler() callback | 165 | - eh_strategy_handler() callback |
166 | This is one big callback which should perform whole error | 166 | This is one big callback which should perform whole error |
diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt index 2bf3cfa3a067..8b2168aa4fc7 100644 --- a/Documentation/scsi/tmscsim.txt +++ b/Documentation/scsi/tmscsim.txt | |||
@@ -381,7 +381,7 @@ Please see http://www.garloff.de/kurt/linux/dc390/problems.html | |||
381 | replaced by the dev index of your scanner). You may try to reset your SCSI | 381 | replaced by the dev index of your scanner). You may try to reset your SCSI |
382 | bus afterwards (echo "RESET" >/proc/scsi/tmscsim/?). | 382 | bus afterwards (echo "RESET" >/proc/scsi/tmscsim/?). |
383 | The problem seems to be solved as of 2.0d18, thanks to Andreas Rick. | 383 | The problem seems to be solved as of 2.0d18, thanks to Andreas Rick. |
384 | * If there is a valid partition table, the driver will use it for determing | 384 | * If there is a valid partition table, the driver will use it for determining |
385 | the mapping. If there's none, a reasonable mapping (Symbios-like) will be | 385 | the mapping. If there's none, a reasonable mapping (Symbios-like) will be |
386 | assumed. Other operating systems may not like this mapping, though | 386 | assumed. Other operating systems may not like this mapping, though |
387 | it's consistent with the BIOS' behaviour. Old DC390 drivers ignored the | 387 | it's consistent with the BIOS' behaviour. Old DC390 drivers ignored the |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 958ccf3aa2ea..4fbf8d5d4e73 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -1263,8 +1263,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1263 | 1263 | ||
1264 | Note: on some notebooks the buffer address cannot be detected | 1264 | Note: on some notebooks the buffer address cannot be detected |
1265 | automatically, or causes hang-up during initialization. | 1265 | automatically, or causes hang-up during initialization. |
1266 | In such a case, specify the buffer top address explicity via | 1266 | In such a case, specify the buffer top address explicitly via |
1267 | buffer_top option. | 1267 | the buffer_top option. |
1268 | For example, | 1268 | For example, |
1269 | Sony F250: buffer_top=0x25a800 | 1269 | Sony F250: buffer_top=0x25a800 |
1270 | Sony F270: buffer_top=0x272800 | 1270 | Sony F270: buffer_top=0x272800 |
diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt index b535c2a198f8..e40cce83327c 100644 --- a/Documentation/sound/alsa/Audiophile-Usb.txt +++ b/Documentation/sound/alsa/Audiophile-Usb.txt | |||
@@ -126,7 +126,7 @@ Here is a list of supported device_setup values for this device: | |||
126 | - Alsa driver default mode | 126 | - Alsa driver default mode |
127 | - maintains backward compatibility with setups that do not use this | 127 | - maintains backward compatibility with setups that do not use this |
128 | parameter by not introducing any change | 128 | parameter by not introducing any change |
129 | - results sometimes in corrupted sound as decribed earlier | 129 | - results sometimes in corrupted sound as described earlier |
130 | * device_setup=0x01 | 130 | * device_setup=0x01 |
131 | - 16bits 48kHz mode with Di disabled | 131 | - 16bits 48kHz mode with Di disabled |
132 | - Ai,Ao,Do can be used at the same time | 132 | - Ai,Ao,Do can be used at the same time |
diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt index 0db6ca7db28a..9fa5bbdbac82 100644 --- a/Documentation/sound/alsa/MIXART.txt +++ b/Documentation/sound/alsa/MIXART.txt | |||
@@ -97,4 +97,4 @@ COPYRIGHT | |||
97 | ========= | 97 | ========= |
98 | 98 | ||
99 | Copyright (c) 2003 Digigram SA <alsa@digigram.com> | 99 | Copyright (c) 2003 Digigram SA <alsa@digigram.com> |
100 | Distributalbe under GPL. | 100 | Distributable under GPL. |
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index 1fe48846d78f..b1386168f6a9 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt | |||
@@ -71,7 +71,7 @@ The status of MIDI I/O is found in midi* files. It shows the device | |||
71 | name and the received/transmitted bytes through the MIDI device. | 71 | name and the received/transmitted bytes through the MIDI device. |
72 | 72 | ||
73 | When the card is equipped with AC97 codecs, there are codec97#* | 73 | When the card is equipped with AC97 codecs, there are codec97#* |
74 | subdirectories (desribed later). | 74 | subdirectories (described later). |
75 | 75 | ||
76 | When the OSS mixer emulation is enabled (and the module is loaded), | 76 | When the OSS mixer emulation is enabled (and the module is loaded), |
77 | oss_mixer file appears here, too. This shows the current mapping of | 77 | oss_mixer file appears here, too. This shows the current mapping of |
diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt index 39c68f8c4e6c..671144193093 100644 --- a/Documentation/usb/error-codes.txt +++ b/Documentation/usb/error-codes.txt | |||
@@ -126,7 +126,7 @@ one or more packets could finish before an error stops further endpoint I/O. | |||
126 | urb->transfer_flags. | 126 | urb->transfer_flags. |
127 | 127 | ||
128 | -ENODEV Device was removed. Often preceded by a burst of | 128 | -ENODEV Device was removed. Often preceded by a burst of |
129 | other errors, since the hub driver does't detect | 129 | other errors, since the hub driver doesn't detect |
130 | device removal events immediately. | 130 | device removal events immediately. |
131 | 131 | ||
132 | -EXDEV ISO transfer only partially completed | 132 | -EXDEV ISO transfer only partially completed |
diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/usb/mtouchusb.txt index cd806bfc8b81..433208871fb4 100644 --- a/Documentation/usb/mtouchusb.txt +++ b/Documentation/usb/mtouchusb.txt | |||
@@ -63,7 +63,7 @@ TODO: | |||
63 | Implement a control urb again to handle requests to and from the device | 63 | Implement a control urb again to handle requests to and from the device |
64 | such as calibration, etc once/if it becomes available. | 64 | such as calibration, etc once/if it becomes available. |
65 | 65 | ||
66 | DISCLAMER: | 66 | DISCLAIMER: |
67 | 67 | ||
68 | I am not a MicroTouch/3M employee, nor have I ever been. 3M does not support | 68 | I am not a MicroTouch/3M employee, nor have I ever been. 3M does not support |
69 | this driver! If you want touch drivers only supported within X, please go to: | 69 | this driver! If you want touch drivers only supported within X, please go to: |
diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt index 2137da97552f..ecb34160e61d 100644 --- a/Documentation/video4linux/meye.txt +++ b/Documentation/video4linux/meye.txt | |||
@@ -29,7 +29,7 @@ driver (PCI vendor/device is 0x136b/0xff01) | |||
29 | 29 | ||
30 | The third one, present in recent (more or less last year) Picturebooks | 30 | The third one, present in recent (more or less last year) Picturebooks |
31 | (C1M* models), is not supported. The manufacturer has given the specs | 31 | (C1M* models), is not supported. The manufacturer has given the specs |
32 | to the developers under a NDA (which allows the develoment of a GPL | 32 | to the developers under a NDA (which allows the development of a GPL |
33 | driver however), but things are not moving very fast (see | 33 | driver however), but things are not moving very fast (see |
34 | http://r-engine.sourceforge.net/) (PCI vendor/device is 0x10cf/0x2011). | 34 | http://r-engine.sourceforge.net/) (PCI vendor/device is 0x10cf/0x2011). |
35 | 35 | ||
diff --git a/Documentation/video4linux/zr36120.txt b/Documentation/video4linux/zr36120.txt index ac6d92d01944..1a1c2d03a5c8 100644 --- a/Documentation/video4linux/zr36120.txt +++ b/Documentation/video4linux/zr36120.txt | |||
@@ -118,9 +118,9 @@ card is not there, please try if any other card gives some | |||
118 | response, and mail me if you got a working tvcard addition. | 118 | response, and mail me if you got a working tvcard addition. |
119 | 119 | ||
120 | PS. <TVCard editors behold!) | 120 | PS. <TVCard editors behold!) |
121 | Dont forget to set video_input to the number of inputs | 121 | Don't forget to set video_input to the number of inputs |
122 | you defined in the video_mux part of the tvcard definition. | 122 | you defined in the video_mux part of the tvcard definition. |
123 | Its a common error to add a channel but not incrementing | 123 | It's a common error to add a channel but not incrementing |
124 | video_input and getting angry with me/v4l/linux/linus :( | 124 | video_input and getting angry with me/v4l/linux/linus :( |
125 | 125 | ||
126 | You are now ready to test the framegrabber with your favorite | 126 | You are now ready to test the framegrabber with your favorite |