diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
tree | b384aef82007144b067cc171d2a9aa168b50b262 | |
parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
147 files changed, 344 insertions, 350 deletions
diff --git a/Documentation/Changes b/Documentation/Changes index abee7f58c1ed..73a8617f1861 100644 --- a/Documentation/Changes +++ b/Documentation/Changes | |||
@@ -201,7 +201,7 @@ udev | |||
201 | ---- | 201 | ---- |
202 | udev is a userspace application for populating /dev dynamically with | 202 | udev is a userspace application for populating /dev dynamically with |
203 | only entries for devices actually present. udev replaces the basic | 203 | only entries for devices actually present. udev replaces the basic |
204 | functionality of devfs, while allowing persistant device naming for | 204 | functionality of devfs, while allowing persistent device naming for |
205 | devices. | 205 | devices. |
206 | 206 | ||
207 | FUSE | 207 | FUSE |
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 2ffb0d62f0fe..05431621c861 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
@@ -489,7 +489,7 @@ size is the size of the area (must be multiples of PAGE_SIZE). | |||
489 | flags can be or'd together and are | 489 | flags can be or'd together and are |
490 | 490 | ||
491 | DMA_MEMORY_MAP - request that the memory returned from | 491 | DMA_MEMORY_MAP - request that the memory returned from |
492 | dma_alloc_coherent() be directly writeable. | 492 | dma_alloc_coherent() be directly writable. |
493 | 493 | ||
494 | DMA_MEMORY_IO - request that the memory returned from | 494 | DMA_MEMORY_IO - request that the memory returned from |
495 | dma_alloc_coherent() be addressable using read/write/memcpy_toio etc. | 495 | dma_alloc_coherent() be addressable using read/write/memcpy_toio etc. |
diff --git a/Documentation/DMA-ISA-LPC.txt b/Documentation/DMA-ISA-LPC.txt index 705f6be92bdb..e767805b4182 100644 --- a/Documentation/DMA-ISA-LPC.txt +++ b/Documentation/DMA-ISA-LPC.txt | |||
@@ -110,7 +110,7 @@ lock. | |||
110 | 110 | ||
111 | Once the DMA transfer is finished (or timed out) you should disable | 111 | Once the DMA transfer is finished (or timed out) you should disable |
112 | the channel again. You should also check get_dma_residue() to make | 112 | the channel again. You should also check get_dma_residue() to make |
113 | sure that all data has been transfered. | 113 | sure that all data has been transferred. |
114 | 114 | ||
115 | Example: | 115 | Example: |
116 | 116 | ||
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt index 5c34910665d1..d389388c733e 100644 --- a/Documentation/MSI-HOWTO.txt +++ b/Documentation/MSI-HOWTO.txt | |||
@@ -219,7 +219,7 @@ into the field vector of each element contained in a second argument. | |||
219 | Note that the pre-assigned IOAPIC dev->irq is valid only if the device | 219 | Note that the pre-assigned IOAPIC dev->irq is valid only if the device |
220 | operates in PIN-IRQ assertion mode. In MSI-X mode, any attempt at | 220 | operates in PIN-IRQ assertion mode. In MSI-X mode, any attempt at |
221 | using dev->irq by the device driver to request for interrupt service | 221 | using dev->irq by the device driver to request for interrupt service |
222 | may result unpredictabe behavior. | 222 | may result in unpredictable behavior. |
223 | 223 | ||
224 | For each MSI-X vector granted, a device driver is responsible for calling | 224 | For each MSI-X vector granted, a device driver is responsible for calling |
225 | other functions like request_irq(), enable_irq(), etc. to enable | 225 | other functions like request_irq(), enable_irq(), etc. to enable |
diff --git a/Documentation/accounting/taskstats.txt b/Documentation/accounting/taskstats.txt index 92ebf29e9041..ff06b738bb88 100644 --- a/Documentation/accounting/taskstats.txt +++ b/Documentation/accounting/taskstats.txt | |||
@@ -96,9 +96,9 @@ a) TASKSTATS_TYPE_AGGR_PID/TGID : attribute containing no payload but indicates | |||
96 | a pid/tgid will be followed by some stats. | 96 | a pid/tgid will be followed by some stats. |
97 | 97 | ||
98 | b) TASKSTATS_TYPE_PID/TGID: attribute whose payload is the pid/tgid whose stats | 98 | b) TASKSTATS_TYPE_PID/TGID: attribute whose payload is the pid/tgid whose stats |
99 | is being returned. | 99 | are being returned. |
100 | 100 | ||
101 | c) TASKSTATS_TYPE_STATS: attribute with a struct taskstsats as payload. The | 101 | c) TASKSTATS_TYPE_STATS: attribute with a struct taskstats as payload. The |
102 | same structure is used for both per-pid and per-tgid stats. | 102 | same structure is used for both per-pid and per-tgid stats. |
103 | 103 | ||
104 | 3. New message sent by kernel whenever a task exits. The payload consists of a | 104 | 3. New message sent by kernel whenever a task exits. The payload consists of a |
@@ -122,12 +122,12 @@ of atomicity). | |||
122 | 122 | ||
123 | However, maintaining per-process, in addition to per-task stats, within the | 123 | However, maintaining per-process, in addition to per-task stats, within the |
124 | kernel has space and time overheads. To address this, the taskstats code | 124 | kernel has space and time overheads. To address this, the taskstats code |
125 | accumalates each exiting task's statistics into a process-wide data structure. | 125 | accumulates each exiting task's statistics into a process-wide data structure. |
126 | When the last task of a process exits, the process level data accumalated also | 126 | When the last task of a process exits, the process level data accumulated also |
127 | gets sent to userspace (along with the per-task data). | 127 | gets sent to userspace (along with the per-task data). |
128 | 128 | ||
129 | When a user queries to get per-tgid data, the sum of all other live threads in | 129 | When a user queries to get per-tgid data, the sum of all other live threads in |
130 | the group is added up and added to the accumalated total for previously exited | 130 | the group is added up and added to the accumulated total for previously exited |
131 | threads of the same thread group. | 131 | threads of the same thread group. |
132 | 132 | ||
133 | Extending taskstats | 133 | Extending taskstats |
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 34bf8f60d8f8..c6c9a9c10d7f 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
@@ -183,7 +183,7 @@ it, the pci dma mapping routines and associated data structures have now been | |||
183 | modified to accomplish a direct page -> bus translation, without requiring | 183 | modified to accomplish a direct page -> bus translation, without requiring |
184 | a virtual address mapping (unlike the earlier scheme of virtual address | 184 | a virtual address mapping (unlike the earlier scheme of virtual address |
185 | -> bus translation). So this works uniformly for high-memory pages (which | 185 | -> bus translation). So this works uniformly for high-memory pages (which |
186 | do not have a correponding kernel virtual address space mapping) and | 186 | do not have a corresponding kernel virtual address space mapping) and |
187 | low-memory pages. | 187 | low-memory pages. |
188 | 188 | ||
189 | Note: Please refer to DMA-mapping.txt for a discussion on PCI high mem DMA | 189 | Note: Please refer to DMA-mapping.txt for a discussion on PCI high mem DMA |
@@ -391,7 +391,7 @@ forced such requests to be broken up into small chunks before being passed | |||
391 | on to the generic block layer, only to be merged by the i/o scheduler | 391 | on to the generic block layer, only to be merged by the i/o scheduler |
392 | when the underlying device was capable of handling the i/o in one shot. | 392 | when the underlying device was capable of handling the i/o in one shot. |
393 | Also, using the buffer head as an i/o structure for i/os that didn't originate | 393 | Also, using the buffer head as an i/o structure for i/os that didn't originate |
394 | from the buffer cache unecessarily added to the weight of the descriptors | 394 | from the buffer cache unnecessarily added to the weight of the descriptors |
395 | which were generated for each such chunk. | 395 | which were generated for each such chunk. |
396 | 396 | ||
397 | The following were some of the goals and expectations considered in the | 397 | The following were some of the goals and expectations considered in the |
@@ -403,14 +403,14 @@ i. Should be appropriate as a descriptor for both raw and buffered i/o - | |||
403 | for raw i/o. | 403 | for raw i/o. |
404 | ii. Ability to represent high-memory buffers (which do not have a virtual | 404 | ii. Ability to represent high-memory buffers (which do not have a virtual |
405 | address mapping in kernel address space). | 405 | address mapping in kernel address space). |
406 | iii.Ability to represent large i/os w/o unecessarily breaking them up (i.e | 406 | iii.Ability to represent large i/os w/o unnecessarily breaking them up (i.e |
407 | greater than PAGE_SIZE chunks in one shot) | 407 | greater than PAGE_SIZE chunks in one shot) |
408 | iv. At the same time, ability to retain independent identity of i/os from | 408 | iv. At the same time, ability to retain independent identity of i/os from |
409 | different sources or i/o units requiring individual completion (e.g. for | 409 | different sources or i/o units requiring individual completion (e.g. for |
410 | latency reasons) | 410 | latency reasons) |
411 | v. Ability to represent an i/o involving multiple physical memory segments | 411 | v. Ability to represent an i/o involving multiple physical memory segments |
412 | (including non-page aligned page fragments, as specified via readv/writev) | 412 | (including non-page aligned page fragments, as specified via readv/writev) |
413 | without unecessarily breaking it up, if the underlying device is capable of | 413 | without unnecessarily breaking it up, if the underlying device is capable of |
414 | handling it. | 414 | handling it. |
415 | vi. Preferably should be based on a memory descriptor structure that can be | 415 | vi. Preferably should be based on a memory descriptor structure that can be |
416 | passed around different types of subsystems or layers, maybe even | 416 | passed around different types of subsystems or layers, maybe even |
@@ -1013,7 +1013,7 @@ Characteristics: | |||
1013 | i. Binary tree | 1013 | i. Binary tree |
1014 | AS and deadline i/o schedulers use red black binary trees for disk position | 1014 | AS and deadline i/o schedulers use red black binary trees for disk position |
1015 | sorting and searching, and a fifo linked list for time-based searching. This | 1015 | sorting and searching, and a fifo linked list for time-based searching. This |
1016 | gives good scalability and good availablility of information. Requests are | 1016 | gives good scalability and good availability of information. Requests are |
1017 | almost always dispatched in disk sort order, so a cache is kept of the next | 1017 | almost always dispatched in disk sort order, so a cache is kept of the next |
1018 | request in sort order to prevent binary tree lookups. | 1018 | request in sort order to prevent binary tree lookups. |
1019 | 1019 | ||
diff --git a/Documentation/cpu-freq/cpufreq-nforce2.txt b/Documentation/cpu-freq/cpufreq-nforce2.txt index 9188337d8f6b..babce1315026 100644 --- a/Documentation/cpu-freq/cpufreq-nforce2.txt +++ b/Documentation/cpu-freq/cpufreq-nforce2.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | The cpufreq-nforce2 driver changes the FSB on nVidia nForce2 plattforms. | 2 | The cpufreq-nforce2 driver changes the FSB on nVidia nForce2 platforms. |
3 | 3 | ||
4 | This works better than on other plattforms, because the FSB of the CPU | 4 | This works better than on other platforms, because the FSB of the CPU |
5 | can be controlled independently from the PCI/AGP clock. | 5 | can be controlled independently from the PCI/AGP clock. |
6 | 6 | ||
7 | The module has two options: | 7 | The module has two options: |
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt index 4868c34f7509..cc60d29b954c 100644 --- a/Documentation/cpu-hotplug.txt +++ b/Documentation/cpu-hotplug.txt | |||
@@ -54,8 +54,8 @@ additional_cpus=n (*) Use this to limit hotpluggable cpus. This option sets | |||
54 | 54 | ||
55 | ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT | 55 | ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT |
56 | to determine the number of potentially hot-pluggable cpus. The implementation | 56 | to determine the number of potentially hot-pluggable cpus. The implementation |
57 | should only rely on this to count the #of cpus, but *MUST* not rely on the | 57 | should only rely on this to count the # of cpus, but *MUST* not rely on the |
58 | apicid values in those tables for disabled apics. In the event BIOS doesnt | 58 | apicid values in those tables for disabled apics. In the event BIOS doesn't |
59 | mark such hot-pluggable cpus as disabled entries, one could use this | 59 | mark such hot-pluggable cpus as disabled entries, one could use this |
60 | parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. | 60 | parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. |
61 | 61 | ||
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 28c4f79662c2..70690f1a14af 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
@@ -92,7 +92,7 @@ Your cooperation is appreciated. | |||
92 | 7 = /dev/full Returns ENOSPC on write | 92 | 7 = /dev/full Returns ENOSPC on write |
93 | 8 = /dev/random Nondeterministic random number gen. | 93 | 8 = /dev/random Nondeterministic random number gen. |
94 | 9 = /dev/urandom Faster, less secure random number gen. | 94 | 9 = /dev/urandom Faster, less secure random number gen. |
95 | 10 = /dev/aio Asyncronous I/O notification interface | 95 | 10 = /dev/aio Asynchronous I/O notification interface |
96 | 11 = /dev/kmsg Writes to this come out as printk's | 96 | 11 = /dev/kmsg Writes to this come out as printk's |
97 | 1 block RAM disk | 97 | 1 block RAM disk |
98 | 0 = /dev/ram0 First RAM disk | 98 | 0 = /dev/ram0 First RAM disk |
@@ -1093,7 +1093,7 @@ Your cooperation is appreciated. | |||
1093 | 1093 | ||
1094 | 55 char DSP56001 digital signal processor | 1094 | 55 char DSP56001 digital signal processor |
1095 | 0 = /dev/dsp56k First DSP56001 | 1095 | 0 = /dev/dsp56k First DSP56001 |
1096 | 55 block Mylex DAC960 PCI RAID controller; eigth controller | 1096 | 55 block Mylex DAC960 PCI RAID controller; eighth controller |
1097 | 0 = /dev/rd/c7d0 First disk, whole disk | 1097 | 0 = /dev/rd/c7d0 First disk, whole disk |
1098 | 8 = /dev/rd/c7d1 Second disk, whole disk | 1098 | 8 = /dev/rd/c7d1 Second disk, whole disk |
1099 | ... | 1099 | ... |
@@ -1456,7 +1456,7 @@ Your cooperation is appreciated. | |||
1456 | 1 = /dev/cum1 Callout device for ttyM1 | 1456 | 1 = /dev/cum1 Callout device for ttyM1 |
1457 | ... | 1457 | ... |
1458 | 1458 | ||
1459 | 79 block Compaq Intelligent Drive Array, eigth controller | 1459 | 79 block Compaq Intelligent Drive Array, eighth controller |
1460 | 0 = /dev/ida/c7d0 First logical drive whole disk | 1460 | 0 = /dev/ida/c7d0 First logical drive whole disk |
1461 | 16 = /dev/ida/c7d1 Second logical drive whole disk | 1461 | 16 = /dev/ida/c7d1 Second logical drive whole disk |
1462 | ... | 1462 | ... |
@@ -1900,7 +1900,7 @@ Your cooperation is appreciated. | |||
1900 | 1 = /dev/av1 Second A/V card | 1900 | 1 = /dev/av1 Second A/V card |
1901 | ... | 1901 | ... |
1902 | 1902 | ||
1903 | 111 block Compaq Next Generation Drive Array, eigth controller | 1903 | 111 block Compaq Next Generation Drive Array, eighth controller |
1904 | 0 = /dev/cciss/c7d0 First logical drive, whole disk | 1904 | 0 = /dev/cciss/c7d0 First logical drive, whole disk |
1905 | 16 = /dev/cciss/c7d1 Second logical drive, whole disk | 1905 | 16 = /dev/cciss/c7d1 Second logical drive, whole disk |
1906 | ... | 1906 | ... |
diff --git a/Documentation/driver-model/porting.txt b/Documentation/driver-model/porting.txt index 98b233cb8b36..92d86f7271b4 100644 --- a/Documentation/driver-model/porting.txt +++ b/Documentation/driver-model/porting.txt | |||
@@ -92,7 +92,7 @@ struct device represents a single device. It mainly contains metadata | |||
92 | describing the relationship the device has to other entities. | 92 | describing the relationship the device has to other entities. |
93 | 93 | ||
94 | 94 | ||
95 | - Embedd a struct device in the bus-specific device type. | 95 | - Embed a struct device in the bus-specific device type. |
96 | 96 | ||
97 | 97 | ||
98 | struct pci_dev { | 98 | struct pci_dev { |
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt index 531239b29082..2ecd834585e6 100644 --- a/Documentation/dvb/ci.txt +++ b/Documentation/dvb/ci.txt | |||
@@ -71,7 +71,7 @@ eliminating the need for any additional ioctls. | |||
71 | The disadvantage is that the driver/hardware has to manage the rest. For | 71 | The disadvantage is that the driver/hardware has to manage the rest. For |
72 | the application programmer it would be as simple as sending/receiving an | 72 | the application programmer it would be as simple as sending/receiving an |
73 | array to/from the CI ioctls as defined in the Linux DVB API. No changes | 73 | array to/from the CI ioctls as defined in the Linux DVB API. No changes |
74 | have been made in the API to accomodate this feature. | 74 | have been made in the API to accommodate this feature. |
75 | 75 | ||
76 | 76 | ||
77 | * Why the need for another CI interface ? | 77 | * Why the need for another CI interface ? |
@@ -102,7 +102,7 @@ This CI interface follows the CI high level interface, which is not | |||
102 | implemented by most applications. Hence this area is revisited. | 102 | implemented by most applications. Hence this area is revisited. |
103 | 103 | ||
104 | This CI interface is quite different in the case that it tries to | 104 | This CI interface is quite different in the case that it tries to |
105 | accomodate all other CI based devices, that fall into the other categories | 105 | accommodate all other CI based devices, that fall into the other categories. |
106 | 106 | ||
107 | This means that this CI interface handles the EN50221 style tags in the | 107 | This means that this CI interface handles the EN50221 style tags in the |
108 | Application layer only and no session management is taken care of by the | 108 | Application layer only and no session management is taken care of by the |
diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt index 6a099edadd62..60e361ba08c0 100644 --- a/Documentation/eisa.txt +++ b/Documentation/eisa.txt | |||
@@ -62,7 +62,7 @@ res : root device I/O resource | |||
62 | bus_base_addr : slot 0 address on this bus | 62 | bus_base_addr : slot 0 address on this bus |
63 | slots : max slot number to probe | 63 | slots : max slot number to probe |
64 | force_probe : Probe even when slot 0 is empty (no EISA mainboard) | 64 | force_probe : Probe even when slot 0 is empty (no EISA mainboard) |
65 | dma_mask : Default DMA mask. Usualy the bridge device dma_mask. | 65 | dma_mask : Default DMA mask. Usually the bridge device dma_mask. |
66 | bus_nr : unique bus id, set by eisa_root_register | 66 | bus_nr : unique bus id, set by eisa_root_register |
67 | 67 | ||
68 | ** Driver : | 68 | ** Driver : |
diff --git a/Documentation/filesystems/adfs.txt b/Documentation/filesystems/adfs.txt index 060abb0c7004..9e8811f92b84 100644 --- a/Documentation/filesystems/adfs.txt +++ b/Documentation/filesystems/adfs.txt | |||
@@ -3,7 +3,7 @@ Mount options for ADFS | |||
3 | 3 | ||
4 | uid=nnn All files in the partition will be owned by | 4 | uid=nnn All files in the partition will be owned by |
5 | user id nnn. Default 0 (root). | 5 | user id nnn. Default 0 (root). |
6 | gid=nnn All files in the partition willbe in group | 6 | gid=nnn All files in the partition will be in group |
7 | nnn. Default 0 (root). | 7 | nnn. Default 0 (root). |
8 | ownmask=nnn The permission mask for ADFS 'owner' permissions | 8 | ownmask=nnn The permission mask for ADFS 'owner' permissions |
9 | will be nnn. Default 0700. | 9 | will be nnn. Default 0700. |
diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt index c3a7afb5eabf..b34cdb50eab4 100644 --- a/Documentation/filesystems/configfs/configfs.txt +++ b/Documentation/filesystems/configfs/configfs.txt | |||
@@ -209,7 +209,7 @@ will happen for write(2). | |||
209 | 209 | ||
210 | [struct config_group] | 210 | [struct config_group] |
211 | 211 | ||
212 | A config_item cannot live in a vaccum. The only way one can be created | 212 | A config_item cannot live in a vacuum. The only way one can be created |
213 | is via mkdir(2) on a config_group. This will trigger creation of a | 213 | is via mkdir(2) on a config_group. This will trigger creation of a |
214 | child item. | 214 | child item. |
215 | 215 | ||
@@ -275,7 +275,7 @@ directory is not empty. | |||
275 | 275 | ||
276 | [struct configfs_subsystem] | 276 | [struct configfs_subsystem] |
277 | 277 | ||
278 | A subsystem must register itself, ususally at module_init time. This | 278 | A subsystem must register itself, usually at module_init time. This |
279 | tells configfs to make the subsystem appear in the file tree. | 279 | tells configfs to make the subsystem appear in the file tree. |
280 | 280 | ||
281 | struct configfs_subsystem { | 281 | struct configfs_subsystem { |
diff --git a/Documentation/filesystems/fuse.txt b/Documentation/filesystems/fuse.txt index a584f05403a4..3d7447738958 100644 --- a/Documentation/filesystems/fuse.txt +++ b/Documentation/filesystems/fuse.txt | |||
@@ -111,7 +111,7 @@ For each connection the following files exist within this directory: | |||
111 | 111 | ||
112 | 'waiting' | 112 | 'waiting' |
113 | 113 | ||
114 | The number of requests which are waiting to be transfered to | 114 | The number of requests which are waiting to be transferred to |
115 | userspace or being processed by the filesystem daemon. If there is | 115 | userspace or being processed by the filesystem daemon. If there is |
116 | no filesystem activity and 'waiting' is non-zero, then the | 116 | no filesystem activity and 'waiting' is non-zero, then the |
117 | filesystem is hung or deadlocked. | 117 | filesystem is hung or deadlocked. |
@@ -136,7 +136,7 @@ following will happen: | |||
136 | 136 | ||
137 | 2) If the request is not yet sent to userspace AND the signal is not | 137 | 2) If the request is not yet sent to userspace AND the signal is not |
138 | fatal, then an 'interrupted' flag is set for the request. When | 138 | fatal, then an 'interrupted' flag is set for the request. When |
139 | the request has been successfully transfered to userspace and | 139 | the request has been successfully transferred to userspace and |
140 | this flag is set, an INTERRUPT request is queued. | 140 | this flag is set, an INTERRUPT request is queued. |
141 | 141 | ||
142 | 3) If the request is already sent to userspace, then an INTERRUPT | 142 | 3) If the request is already sent to userspace, then an INTERRUPT |
diff --git a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt index 33dc360c8e89..38aba03efc5e 100644 --- a/Documentation/filesystems/hpfs.txt +++ b/Documentation/filesystems/hpfs.txt | |||
@@ -274,7 +274,7 @@ History | |||
274 | Fixed race-condition in buffer code - it is in all filesystems in Linux; | 274 | Fixed race-condition in buffer code - it is in all filesystems in Linux; |
275 | when reading device (cat /dev/hda) while creating files on it, files | 275 | when reading device (cat /dev/hda) while creating files on it, files |
276 | could be damaged | 276 | could be damaged |
277 | 2.02 Woraround for bug in breada in Linux. breada could cause accesses beyond | 277 | 2.02 Workaround for bug in breada in Linux. breada could cause accesses beyond |
278 | end of partition | 278 | end of partition |
279 | 2.03 Char, block devices and pipes are correctly created | 279 | 2.03 Char, block devices and pipes are correctly created |
280 | Fixed non-crashing race in unlink (Alexander Viro) | 280 | Fixed non-crashing race in unlink (Alexander Viro) |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 35f105b29e3e..13ba649bda75 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
@@ -337,7 +337,7 @@ Finally, for a mirrored volume, i.e. raid level 1, the table would look like | |||
337 | this (note all values are in 512-byte sectors): | 337 | this (note all values are in 512-byte sectors): |
338 | 338 | ||
339 | --- cut here --- | 339 | --- cut here --- |
340 | # Ofs Size Raid Log Number Region Should Number Source Start Taget Start | 340 | # Ofs Size Raid Log Number Region Should Number Source Start Target Start |
341 | # in of the type type of log size sync? of Device in Device in | 341 | # in of the type type of log size sync? of Device in Device in |
342 | # vol volume params mirrors Device Device | 342 | # vol volume params mirrors Device Device |
343 | 0 2056320 mirror core 2 16 nosync 2 /dev/hda1 0 /dev/hdb1 0 | 343 | 0 2056320 mirror core 2 16 nosync 2 /dev/hda1 0 /dev/hdb1 0 |
@@ -599,7 +599,7 @@ Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. | |||
599 | - Major bug fixes for reading files and volumes in corner cases which | 599 | - Major bug fixes for reading files and volumes in corner cases which |
600 | were being hit by Windows 2k/XP users. | 600 | were being hit by Windows 2k/XP users. |
601 | 2.1.2: | 601 | 2.1.2: |
602 | - Major bug fixes aleviating the hangs in statfs experienced by some | 602 | - Major bug fixes alleviating the hangs in statfs experienced by some |
603 | users. | 603 | users. |
604 | 2.1.1: | 604 | 2.1.1: |
605 | - Update handling of compressed files so people no longer get the | 605 | - Update handling of compressed files so people no longer get the |
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 4389c684a80a..af6defd10cb6 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
@@ -30,7 +30,7 @@ Caveats | |||
30 | Features which OCFS2 does not support yet: | 30 | Features which OCFS2 does not support yet: |
31 | - sparse files | 31 | - sparse files |
32 | - extended attributes | 32 | - extended attributes |
33 | - shared writeable mmap | 33 | - shared writable mmap |
34 | - loopback is supported, but data written will not | 34 | - loopback is supported, but data written will not |
35 | be cluster coherent. | 35 | be cluster coherent. |
36 | - quotas | 36 | - quotas |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 3355e6920105..72af5de1effb 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -1220,9 +1220,9 @@ applications are using mlock(), or if you are running with no swap then | |||
1220 | you probably should increase the lower_zone_protection setting. | 1220 | you probably should increase the lower_zone_protection setting. |
1221 | 1221 | ||
1222 | The units of this tunable are fairly vague. It is approximately equal | 1222 | The units of this tunable are fairly vague. It is approximately equal |
1223 | to "megabytes". So setting lower_zone_protection=100 will protect around 100 | 1223 | to "megabytes," so setting lower_zone_protection=100 will protect around 100 |
1224 | megabytes of the lowmem zone from user allocations. It will also make | 1224 | megabytes of the lowmem zone from user allocations. It will also make |
1225 | those 100 megabytes unavaliable for use by applications and by | 1225 | those 100 megabytes unavailable for use by applications and by |
1226 | pagecache, so there is a cost. | 1226 | pagecache, so there is a cost. |
1227 | 1227 | ||
1228 | The effects of this tunable may be observed by monitoring | 1228 | The effects of this tunable may be observed by monitoring |
@@ -1538,10 +1538,10 @@ TCP settings | |||
1538 | tcp_ecn | 1538 | tcp_ecn |
1539 | ------- | 1539 | ------- |
1540 | 1540 | ||
1541 | This file controls the use of the ECN bit in the IPv4 headers, this is a new | 1541 | This file controls the use of the ECN bit in the IPv4 headers. This is a new |
1542 | feature about Explicit Congestion Notification, but some routers and firewalls | 1542 | feature about Explicit Congestion Notification, but some routers and firewalls |
1543 | block trafic that has this bit set, so it could be necessary to echo 0 to | 1543 | block traffic that has this bit set, so it could be necessary to echo 0 to |
1544 | /proc/sys/net/ipv4/tcp_ecn, if you want to talk to this sites. For more info | 1544 | /proc/sys/net/ipv4/tcp_ecn if you want to talk to these sites. For more info |
1545 | you could read RFC2481. | 1545 | you could read RFC2481. |
1546 | 1546 | ||
1547 | tcp_retrans_collapse | 1547 | tcp_retrans_collapse |
diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt index 982645a1981d..1343d118a9b2 100644 --- a/Documentation/filesystems/spufs.txt +++ b/Documentation/filesystems/spufs.txt | |||
@@ -210,7 +210,7 @@ FILES | |||
210 | /signal2 | 210 | /signal2 |
211 | The two signal notification channels of an SPU. These are read-write | 211 | The two signal notification channels of an SPU. These are read-write |
212 | files that operate on a 32 bit word. Writing to one of these files | 212 | files that operate on a 32 bit word. Writing to one of these files |
213 | triggers an interrupt on the SPU. The value writting to the signal | 213 | triggers an interrupt on the SPU. The value written to the signal |
214 | files can be read from the SPU through a channel read or from host user | 214 | files can be read from the SPU through a channel read or from host user |
215 | space through the file. After the value has been read by the SPU, it | 215 | space through the file. After the value has been read by the SPU, it |
216 | is reset to zero. The possible operations on an open signal1 or sig- | 216 | is reset to zero. The possible operations on an open signal1 or sig- |
diff --git a/Documentation/fujitsu/frv/gdbstub.txt b/Documentation/fujitsu/frv/gdbstub.txt index 6ce5aa9abbc5..9304fb36ae8a 100644 --- a/Documentation/fujitsu/frv/gdbstub.txt +++ b/Documentation/fujitsu/frv/gdbstub.txt | |||
@@ -59,7 +59,7 @@ the following things on the "Kernel Hacking" tab: | |||
59 | Then build as usual, download to the board and execute. Note that if | 59 | Then build as usual, download to the board and execute. Note that if |
60 | "Immediate activation" was selected, then the kernel will wait for GDB to | 60 | "Immediate activation" was selected, then the kernel will wait for GDB to |
61 | attach. If not, then the kernel will boot immediately and GDB will have to | 61 | attach. If not, then the kernel will boot immediately and GDB will have to |
62 | interupt it or wait for an exception to occur if before doing anything with | 62 | interrupt it or wait for an exception to occur before doing anything with |
63 | the kernel. | 63 | the kernel. |
64 | 64 | ||
65 | 65 | ||
diff --git a/Documentation/fujitsu/frv/kernel-ABI.txt b/Documentation/fujitsu/frv/kernel-ABI.txt index 8b0a5fc8bfd9..aaa1cec86f0b 100644 --- a/Documentation/fujitsu/frv/kernel-ABI.txt +++ b/Documentation/fujitsu/frv/kernel-ABI.txt | |||
@@ -156,7 +156,7 @@ with the main kernel in this regard. Hence the debug mode code (gdbstub) is | |||
156 | almost completely self-contained. The only external code used is the | 156 | almost completely self-contained. The only external code used is the |
157 | sprintf family of functions. | 157 | sprintf family of functions. |
158 | 158 | ||
159 | Futhermore, break.S is so complicated because single-step mode does not | 159 | Furthermore, break.S is so complicated because single-step mode does not |
160 | switch off on entry to an exception. That means unless manually disabled, | 160 | switch off on entry to an exception. That means unless manually disabled, |
161 | single-stepping will blithely go on stepping into things like interrupts. | 161 | single-stepping will blithely go on stepping into things like interrupts. |
162 | See gdbstub.txt for more information. | 162 | See gdbstub.txt for more information. |
diff --git a/Documentation/ide.txt b/Documentation/ide.txt index 0bf38baa2db9..786c3a766995 100644 --- a/Documentation/ide.txt +++ b/Documentation/ide.txt | |||
@@ -390,5 +390,5 @@ mlord@pobox.com | |||
390 | Wed Apr 17 22:52:44 CEST 2002 edited by Marcin Dalecki, the current | 390 | Wed Apr 17 22:52:44 CEST 2002 edited by Marcin Dalecki, the current |
391 | maintainer. | 391 | maintainer. |
392 | 392 | ||
393 | Wed Aug 20 22:31:29 CEST 2003 updated ide boot uptions to current ide.c | 393 | Wed Aug 20 22:31:29 CEST 2003 updated ide boot options to current ide.c |
394 | comments at 2.6.0-test4 time. Maciej Soltysiak <solt@dns.toxicfilms.tv> | 394 | comments at 2.6.0-test4 time. Maciej Soltysiak <solt@dns.toxicfilms.tv> |
diff --git a/Documentation/input/amijoy.txt b/Documentation/input/amijoy.txt index 4f0e89df5c51..7dc4f175943c 100644 --- a/Documentation/input/amijoy.txt +++ b/Documentation/input/amijoy.txt | |||
@@ -91,8 +91,8 @@ JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 | |||
91 | | 1 | M0HQ | JOY0DAT Horizontal Clock (quadrature) | | 91 | | 1 | M0HQ | JOY0DAT Horizontal Clock (quadrature) | |
92 | | 2 | M0V | JOY0DAT Vertical Clock | | 92 | | 2 | M0V | JOY0DAT Vertical Clock | |
93 | | 3 | M0VQ | JOY0DAT Vertical Clock (quadrature) | | 93 | | 3 | M0VQ | JOY0DAT Vertical Clock (quadrature) | |
94 | | 4 | M1V | JOY1DAT Horizontall Clock | | 94 | | 4 | M1V | JOY1DAT Horizontal Clock | |
95 | | 5 | M1VQ | JOY1DAT Horizontall Clock (quadrature) | | 95 | | 5 | M1VQ | JOY1DAT Horizontal Clock (quadrature) | |
96 | | 6 | M1V | JOY1DAT Vertical Clock | | 96 | | 6 | M1V | JOY1DAT Vertical Clock | |
97 | | 7 | M1VQ | JOY1DAT Vertical Clock (quadrature) | | 97 | | 7 | M1VQ | JOY1DAT Vertical Clock (quadrature) | |
98 | +--------+----------+-----------------------------------------+ | 98 | +--------+----------+-----------------------------------------+ |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index 1e7e5853ba4c..668f4d0d97d6 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt | |||
@@ -103,7 +103,7 @@ LEFT=0x74 & RIGHT=0x75). | |||
103 | 103 | ||
104 | 5.1 Joystick Event Reporting | 104 | 5.1 Joystick Event Reporting |
105 | 105 | ||
106 | In this mode, the ikbd generates a record whever the joystick position is | 106 | In this mode, the ikbd generates a record whenever the joystick position is |
107 | changed (i.e. for each opening or closing of a joystick switch or trigger). | 107 | changed (i.e. for each opening or closing of a joystick switch or trigger). |
108 | 108 | ||
109 | The joystick event record is two bytes of the form: | 109 | The joystick event record is two bytes of the form: |
@@ -277,8 +277,8 @@ default to 1 at RESET (or power-up). | |||
277 | 9.7 SET MOUSE SCALE | 277 | 9.7 SET MOUSE SCALE |
278 | 278 | ||
279 | 0x0C | 279 | 0x0C |
280 | X ; horizontal mouse ticks per internel X | 280 | X ; horizontal mouse ticks per internal X |
281 | Y ; vertical mouse ticks per internel Y | 281 | Y ; vertical mouse ticks per internal Y |
282 | 282 | ||
283 | This command sets the scale factor for the ABSOLUTE MOUSE POSITIONING mode. | 283 | This command sets the scale factor for the ABSOLUTE MOUSE POSITIONING mode. |
284 | In this mode, the specified number of mouse phase changes ('clicks') must | 284 | In this mode, the specified number of mouse phase changes ('clicks') must |
@@ -323,7 +323,7 @@ mouse position. | |||
323 | 0x0F | 323 | 0x0F |
324 | 324 | ||
325 | This command makes the origin of the Y axis to be at the bottom of the | 325 | This command makes the origin of the Y axis to be at the bottom of the |
326 | logical coordinate system internel to the ikbd for all relative or absolute | 326 | logical coordinate system internal to the ikbd for all relative or absolute |
327 | mouse motion. This causes mouse motion toward the user to be negative in sign | 327 | mouse motion. This causes mouse motion toward the user to be negative in sign |
328 | and away from the user to be positive. | 328 | and away from the user to be positive. |
329 | 329 | ||
@@ -597,8 +597,8 @@ mode or FIRE BUTTON MONITORING mode. | |||
597 | 597 | ||
598 | 10. SCAN CODES | 598 | 10. SCAN CODES |
599 | 599 | ||
600 | The key scan codes return by the ikbd are chosen to simplify the | 600 | The key scan codes returned by the ikbd are chosen to simplify the |
601 | implementaion of GSX. | 601 | implementation of GSX. |
602 | 602 | ||
603 | GSX Standard Keyboard Mapping. | 603 | GSX Standard Keyboard Mapping. |
604 | 604 | ||
diff --git a/Documentation/input/yealink.txt b/Documentation/input/yealink.txt index 0a8c97e87d47..5360e434486c 100644 --- a/Documentation/input/yealink.txt +++ b/Documentation/input/yealink.txt | |||
@@ -134,7 +134,7 @@ Reading /sys/../lineX will return the format string with its current value: | |||
134 | 888888888888 | 134 | 888888888888 |
135 | Linux Rocks! | 135 | Linux Rocks! |
136 | 136 | ||
137 | Writing to /sys/../lineX will set the coresponding LCD line. | 137 | Writing to /sys/../lineX will set the corresponding LCD line. |
138 | - Excess characters are ignored. | 138 | - Excess characters are ignored. |
139 | - If less characters are written than allowed, the remaining digits are | 139 | - If less characters are written than allowed, the remaining digits are |
140 | unchanged. | 140 | unchanged. |
diff --git a/Documentation/ioctl/cdrom.txt b/Documentation/ioctl/cdrom.txt index 8ec32cc49eb1..62d4af44ec4a 100644 --- a/Documentation/ioctl/cdrom.txt +++ b/Documentation/ioctl/cdrom.txt | |||
@@ -735,7 +735,7 @@ CDROM_DISC_STATUS Get disc type, etc. | |||
735 | Ok, this is where problems start. The current interface for | 735 | Ok, this is where problems start. The current interface for |
736 | the CDROM_DISC_STATUS ioctl is flawed. It makes the false | 736 | the CDROM_DISC_STATUS ioctl is flawed. It makes the false |
737 | assumption that CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. | 737 | assumption that CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. |
738 | Unfortunatly, while this is often the case, it is also | 738 | Unfortunately, while this is often the case, it is also |
739 | very common for CDs to have some tracks with data, and some | 739 | very common for CDs to have some tracks with data, and some |
740 | tracks with audio. Just because I feel like it, I declare | 740 | tracks with audio. Just because I feel like it, I declare |
741 | the following to be the best way to cope. If the CD has | 741 | the following to be the best way to cope. If the CD has |
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 50f4eddf899c..4b3d6710c504 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
@@ -227,9 +227,9 @@ more details, with real examples. | |||
227 | be included in a library, lib.a. | 227 | be included in a library, lib.a. |
228 | All objects listed with lib-y are combined in a single | 228 | All objects listed with lib-y are combined in a single |
229 | library for that directory. | 229 | library for that directory. |
230 | Objects that are listed in obj-y and additionaly listed in | 230 | Objects that are listed in obj-y and additionally listed in |
231 | lib-y will not be included in the library, since they will anyway | 231 | lib-y will not be included in the library, since they will |
232 | be accessible. | 232 | be accessible anyway. |
233 | For consistency, objects listed in lib-m will be included in lib.a. | 233 | For consistency, objects listed in lib-m will be included in lib.a. |
234 | 234 | ||
235 | Note that the same kbuild makefile may list files to be built-in | 235 | Note that the same kbuild makefile may list files to be built-in |
@@ -535,7 +535,7 @@ Both possibilities are described in the following. | |||
535 | Host programs can be made up based on composite objects. | 535 | Host programs can be made up based on composite objects. |
536 | The syntax used to define composite objects for host programs is | 536 | The syntax used to define composite objects for host programs is |
537 | similar to the syntax used for kernel objects. | 537 | similar to the syntax used for kernel objects. |
538 | $(<executeable>-objs) lists all objects used to link the final | 538 | $(<executable>-objs) lists all objects used to link the final |
539 | executable. | 539 | executable. |
540 | 540 | ||
541 | Example: | 541 | Example: |
@@ -1022,7 +1022,7 @@ When kbuild executes, the following steps are followed (roughly): | |||
1022 | In this example, there are two possible targets, requiring different | 1022 | In this example, there are two possible targets, requiring different |
1023 | options to the linker. The linker options are specified using the | 1023 | options to the linker. The linker options are specified using the |
1024 | LDFLAGS_$@ syntax - one for each potential target. | 1024 | LDFLAGS_$@ syntax - one for each potential target. |
1025 | $(targets) are assinged all potential targets, by which kbuild knows | 1025 | $(targets) are assigned all potential targets, by which kbuild knows |
1026 | the targets and will: | 1026 | the targets and will: |
1027 | 1) check for commandline changes | 1027 | 1) check for commandline changes |
1028 | 2) delete target during make clean | 1028 | 2) delete target during make clean |
diff --git a/Documentation/keys.txt b/Documentation/keys.txt index 3da586bc7859..60c665d9cfaa 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt | |||
@@ -304,7 +304,7 @@ about the status of the key service: | |||
304 | R Revoked | 304 | R Revoked |
305 | D Dead | 305 | D Dead |
306 | Q Contributes to user's quota | 306 | Q Contributes to user's quota |
307 | U Under contruction by callback to userspace | 307 | U Under construction by callback to userspace |
308 | N Negative key | 308 | N Negative key |
309 | 309 | ||
310 | This file must be enabled at kernel configuration time as it allows anyone | 310 | This file must be enabled at kernel configuration time as it allows anyone |
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt index c487186eb2b9..6f639e3473af 100644 --- a/Documentation/laptop-mode.txt +++ b/Documentation/laptop-mode.txt | |||
@@ -121,7 +121,7 @@ contains the following options: | |||
121 | MAX_AGE: | 121 | MAX_AGE: |
122 | 122 | ||
123 | Maximum time, in seconds, of hard drive spindown time that you are | 123 | Maximum time, in seconds, of hard drive spindown time that you are |
124 | confortable with. Worst case, it's possible that you could lose this | 124 | comfortable with. Worst case, it's possible that you could lose this |
125 | amount of work if your battery fails while you're in laptop mode. | 125 | amount of work if your battery fails while you're in laptop mode. |
126 | 126 | ||
127 | MINIMUM_BATTERY_MINUTES: | 127 | MINIMUM_BATTERY_MINUTES: |
@@ -235,7 +235,7 @@ It should be installed as /etc/default/laptop-mode on Debian, and as | |||
235 | 235 | ||
236 | --------------------CONFIG FILE BEGIN------------------------------------------- | 236 | --------------------CONFIG FILE BEGIN------------------------------------------- |
237 | # Maximum time, in seconds, of hard drive spindown time that you are | 237 | # Maximum time, in seconds, of hard drive spindown time that you are |
238 | # confortable with. Worst case, it's possible that you could lose this | 238 | # comfortable with. Worst case, it's possible that you could lose this |
239 | # amount of work if your battery fails you while in laptop mode. | 239 | # amount of work if your battery fails you while in laptop mode. |
240 | #MAX_AGE=600 | 240 | #MAX_AGE=600 |
241 | 241 | ||
@@ -350,7 +350,7 @@ fi | |||
350 | # set defaults instead: | 350 | # set defaults instead: |
351 | 351 | ||
352 | # Maximum time, in seconds, of hard drive spindown time that you are | 352 | # Maximum time, in seconds, of hard drive spindown time that you are |
353 | # confortable with. Worst case, it's possible that you could lose this | 353 | # comfortable with. Worst case, it's possible that you could lose this |
354 | # amount of work if your battery fails you while in laptop mode. | 354 | # amount of work if your battery fails you while in laptop mode. |
355 | MAX_AGE=${MAX_AGE:-'600'} | 355 | MAX_AGE=${MAX_AGE:-'600'} |
356 | 356 | ||
@@ -699,7 +699,7 @@ ACPI integration | |||
699 | Dax Kelson submitted this so that the ACPI acpid daemon will | 699 | Dax Kelson submitted this so that the ACPI acpid daemon will |
700 | kick off the laptop_mode script and run hdparm. The part that | 700 | kick off the laptop_mode script and run hdparm. The part that |
701 | automatically disables laptop mode when the battery is low was | 701 | automatically disables laptop mode when the battery is low was |
702 | writen by Jan Topinski. | 702 | written by Jan Topinski. |
703 | 703 | ||
704 | -----------------/etc/acpi/events/ac_adapter BEGIN------------------------------ | 704 | -----------------/etc/acpi/events/ac_adapter BEGIN------------------------------ |
705 | event=ac_adapter | 705 | event=ac_adapter |
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 7751704b6db1..58408dd023c7 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
@@ -212,7 +212,7 @@ There are some minimal guarantees that may be expected of a CPU: | |||
212 | 212 | ||
213 | STORE *X = c, d = LOAD *X | 213 | STORE *X = c, d = LOAD *X |
214 | 214 | ||
215 | (Loads and stores overlap if they are targetted at overlapping pieces of | 215 | (Loads and stores overlap if they are targeted at overlapping pieces of |
216 | memory). | 216 | memory). |
217 | 217 | ||
218 | And there are a number of things that _must_ or _must_not_ be assumed: | 218 | And there are a number of things that _must_ or _must_not_ be assumed: |
diff --git a/Documentation/networking/NAPI_HOWTO.txt b/Documentation/networking/NAPI_HOWTO.txt index 93af3e87c65b..fb8dc6422a52 100644 --- a/Documentation/networking/NAPI_HOWTO.txt +++ b/Documentation/networking/NAPI_HOWTO.txt | |||
@@ -95,8 +95,8 @@ There are two types of event register ACK mechanisms. | |||
95 | Move all to dev->poll() | 95 | Move all to dev->poll() |
96 | 96 | ||
97 | C) Ability to detect new work correctly. | 97 | C) Ability to detect new work correctly. |
98 | NAPI works by shutting down event interrupts when theres work and | 98 | NAPI works by shutting down event interrupts when there's work and |
99 | turning them on when theres none. | 99 | turning them on when there's none. |
100 | New packets might show up in the small window while interrupts were being | 100 | New packets might show up in the small window while interrupts were being |
101 | re-enabled (refer to appendix 2). A packet might sneak in during the period | 101 | re-enabled (refer to appendix 2). A packet might sneak in during the period |
102 | we are enabling interrupts. We only get to know about such a packet when the | 102 | we are enabling interrupts. We only get to know about such a packet when the |
@@ -114,7 +114,7 @@ Locking rules and environmental guarantees | |||
114 | only one CPU can pick the initial interrupt and hence the initial | 114 | only one CPU can pick the initial interrupt and hence the initial |
115 | netif_rx_schedule(dev); | 115 | netif_rx_schedule(dev); |
116 | - The core layer invokes devices to send packets in a round robin format. | 116 | - The core layer invokes devices to send packets in a round robin format. |
117 | This implies receive is totaly lockless because of the guarantee only that | 117 | This implies receive is totally lockless because of the guarantee that only |
118 | one CPU is executing it. | 118 | one CPU is executing it. |
119 | - contention can only be the result of some other CPU accessing the rx | 119 | - contention can only be the result of some other CPU accessing the rx |
120 | ring. This happens only in close() and suspend() (when these methods | 120 | ring. This happens only in close() and suspend() (when these methods |
@@ -510,7 +510,7 @@ static int my_poll (struct net_device *dev, int *budget) | |||
510 | an interrupt will be generated */ | 510 | an interrupt will be generated */ |
511 | goto done; | 511 | goto done; |
512 | } | 512 | } |
513 | /* done! at least thats what it looks like ;-> | 513 | /* done! at least that's what it looks like ;-> |
514 | if new packets came in after our last check on status bits | 514 | if new packets came in after our last check on status bits |
515 | they'll be caught by the while check and we go back and clear them | 515 | they'll be caught by the while check and we go back and clear them |
516 | since we havent exceeded our quota */ | 516 | since we havent exceeded our quota */ |
@@ -535,11 +535,11 @@ done: | |||
535 | * 1. it can race with disabling irqs in irq handler (which are done to | 535 | * 1. it can race with disabling irqs in irq handler (which are done to |
536 | * schedule polls) | 536 | * schedule polls) |
537 | * 2. it can race with dis/enabling irqs in other poll threads | 537 | * 2. it can race with dis/enabling irqs in other poll threads |
538 | * 3. if an irq raised after the begining of the outer beginning | 538 | * 3. if an irq raised after the beginning of the outer beginning |
539 | * loop(marked in the code above), it will be immediately | 539 | * loop (marked in the code above), it will be immediately |
540 | * triggered here. | 540 | * triggered here. |
541 | * | 541 | * |
542 | * Summarizing: the logic may results in some redundant irqs both | 542 | * Summarizing: the logic may result in some redundant irqs both |
543 | * due to races in masking and due to too late acking of already | 543 | * due to races in masking and due to too late acking of already |
544 | * processed irqs. The good news: no events are ever lost. | 544 | * processed irqs. The good news: no events are ever lost. |
545 | */ | 545 | */ |
@@ -601,7 +601,7 @@ a) | |||
601 | 601 | ||
602 | 5) dev->close() and dev->suspend() issues | 602 | 5) dev->close() and dev->suspend() issues |
603 | ========================================== | 603 | ========================================== |
604 | The driver writter neednt worry about this. The top net layer takes | 604 | The driver writer needn't worry about this; the top net layer takes |
605 | care of it. | 605 | care of it. |
606 | 606 | ||
607 | 6) Adding new Stats to /proc | 607 | 6) Adding new Stats to /proc |
@@ -622,9 +622,9 @@ FC should be programmed to apply in the case when the system cant pull out | |||
622 | packets fast enough i.e send a pause only when you run out of rx buffers. | 622 | packets fast enough i.e send a pause only when you run out of rx buffers. |
623 | Note FC in itself is a good solution but we have found it to not be | 623 | Note FC in itself is a good solution but we have found it to not be |
624 | much of a commodity feature (both in NICs and switches) and hence falls | 624 | much of a commodity feature (both in NICs and switches) and hence falls |
625 | under the same category as using NIC based mitigation. Also experiments | 625 | under the same category as using NIC based mitigation. Also, experiments |
626 | indicate that its much harder to resolve the resource allocation | 626 | indicate that it's much harder to resolve the resource allocation |
627 | issue (aka lazy receiving that NAPI offers) and hence quantify its usefullness | 627 | issue (aka lazy receiving that NAPI offers) and hence quantify its usefulness |
628 | proved harder. In any case, FC works even better with NAPI but is not | 628 | proved harder. In any case, FC works even better with NAPI but is not |
629 | necessary. | 629 | necessary. |
630 | 630 | ||
@@ -678,10 +678,10 @@ routine: | |||
678 | CSR5 bit of interest is only the rx status. | 678 | CSR5 bit of interest is only the rx status. |
679 | If you look at the last if statement: | 679 | If you look at the last if statement: |
680 | you just finished grabbing all the packets from the rx ring .. you check if | 680 | you just finished grabbing all the packets from the rx ring .. you check if |
681 | status bit says theres more packets just in ... it says none; you then | 681 | status bit says there are more packets just in ... it says none; you then |
682 | enable rx interrupts again; if a new packet just came in during this check, | 682 | enable rx interrupts again; if a new packet just came in during this check, |
683 | we are counting that CSR5 will be set in that small window of opportunity | 683 | we are counting that CSR5 will be set in that small window of opportunity |
684 | and that by re-enabling interrupts, we would actually triger an interrupt | 684 | and that by re-enabling interrupts, we would actually trigger an interrupt |
685 | to register the new packet for processing. | 685 | to register the new packet for processing. |
686 | 686 | ||
687 | [The above description nay be very verbose, if you have better wording | 687 | [The above description nay be very verbose, if you have better wording |
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt index 64896470e279..6387d3decf85 100644 --- a/Documentation/networking/cs89x0.txt +++ b/Documentation/networking/cs89x0.txt | |||
@@ -248,7 +248,7 @@ c) The driver's hardware probe routine is designed to avoid | |||
248 | with device probing. To avoid this behaviour, add one | 248 | with device probing. To avoid this behaviour, add one |
249 | to the `io=' module parameter. This doesn't actually change | 249 | to the `io=' module parameter. This doesn't actually change |
250 | the I/O address, but it is a flag to tell the driver | 250 | the I/O address, but it is a flag to tell the driver |
251 | topartially initialise the hardware before trying to | 251 | to partially initialise the hardware before trying to |
252 | identify the card. This could be dangerous if you are | 252 | identify the card. This could be dangerous if you are |
253 | not sure that there is a cs89x0 card at the provided address. | 253 | not sure that there is a cs89x0 card at the provided address. |
254 | 254 | ||
@@ -620,8 +620,8 @@ I/O Address Device IRQ Device | |||
620 | 12 Mouse (PS/2) | 620 | 12 Mouse (PS/2) |
621 | Memory Address Device 13 Math Coprocessor | 621 | Memory Address Device 13 Math Coprocessor |
622 | -------------- --------------------- 14 Hard Disk controller | 622 | -------------- --------------------- 14 Hard Disk controller |
623 | A000-BFFF EGA Graphics Adpater | 623 | A000-BFFF EGA Graphics Adapter |
624 | A000-C7FF VGA Graphics Adpater | 624 | A000-C7FF VGA Graphics Adapter |
625 | B000-BFFF Mono Graphics Adapter | 625 | B000-BFFF Mono Graphics Adapter |
626 | B800-BFFF Color Graphics Adapter | 626 | B800-BFFF Color Graphics Adapter |
627 | E000-FFFF AT BIOS | 627 | E000-FFFF AT BIOS |
diff --git a/Documentation/networking/iphase.txt b/Documentation/networking/iphase.txt index 493203a080a8..55eac4a784e2 100644 --- a/Documentation/networking/iphase.txt +++ b/Documentation/networking/iphase.txt | |||
@@ -81,7 +81,7 @@ Installation | |||
81 | 1M. The RAM size decides the number of buffers and buffer size. The default | 81 | 1M. The RAM size decides the number of buffers and buffer size. The default |
82 | size and number of buffers are set as following: | 82 | size and number of buffers are set as following: |
83 | 83 | ||
84 | Totol Rx RAM Tx RAM Rx Buf Tx Buf Rx buf Tx buf | 84 | Total Rx RAM Tx RAM Rx Buf Tx Buf Rx buf Tx buf |
85 | RAM size size size size size cnt cnt | 85 | RAM size size size size size cnt cnt |
86 | -------- ------ ------ ------ ------ ------ ------ | 86 | -------- ------ ------ ------ ------ ------ ------ |
87 | 128K 64K 64K 10K 10K 6 6 | 87 | 128K 64K 64K 10K 10K 6 6 |
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 12a008a5c221..5a232d946be3 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
@@ -284,7 +284,7 @@ the necessary memory, so normally limits can be reached. | |||
284 | ------------------- | 284 | ------------------- |
285 | 285 | ||
286 | If you check the source code you will see that what I draw here as a frame | 286 | If you check the source code you will see that what I draw here as a frame |
287 | is not only the link level frame. At the begining of each frame there is a | 287 | is not only the link level frame. At the beginning of each frame there is a |
288 | header called struct tpacket_hdr used in PACKET_MMAP to hold link level's frame | 288 | header called struct tpacket_hdr used in PACKET_MMAP to hold link level's frame |
289 | meta information like timestamp. So what we draw here a frame it's really | 289 | meta information like timestamp. So what we draw here a frame it's really |
290 | the following (from include/linux/if_packet.h): | 290 | the following (from include/linux/if_packet.h): |
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index c8eee23be8c0..c6cf4a3c16e0 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt | |||
@@ -63,8 +63,8 @@ Current: | |||
63 | Result: OK: 13101142(c12220741+d880401) usec, 10000000 (60byte,0frags) | 63 | Result: OK: 13101142(c12220741+d880401) usec, 10000000 (60byte,0frags) |
64 | 763292pps 390Mb/sec (390805504bps) errors: 39664 | 64 | 763292pps 390Mb/sec (390805504bps) errors: 39664 |
65 | 65 | ||
66 | Confguring threads and devices | 66 | Configuring threads and devices |
67 | ============================== | 67 | ================================ |
68 | This is done via the /proc interface easiest done via pgset in the scripts | 68 | This is done via the /proc interface easiest done via pgset in the scripts |
69 | 69 | ||
70 | Examples: | 70 | Examples: |
@@ -116,7 +116,7 @@ Examples: | |||
116 | there must be no spaces between the | 116 | there must be no spaces between the |
117 | arguments. Leading zeros are required. | 117 | arguments. Leading zeros are required. |
118 | Do not set the bottom of stack bit, | 118 | Do not set the bottom of stack bit, |
119 | thats done automatically. If you do | 119 | that's done automatically. If you do |
120 | set the bottom of stack bit, that | 120 | set the bottom of stack bit, that |
121 | indicates that you want to randomly | 121 | indicates that you want to randomly |
122 | generate that address and the flag | 122 | generate that address and the flag |
diff --git a/Documentation/networking/proc_net_tcp.txt b/Documentation/networking/proc_net_tcp.txt index 59cb915c3713..5e21f7cb6383 100644 --- a/Documentation/networking/proc_net_tcp.txt +++ b/Documentation/networking/proc_net_tcp.txt | |||
@@ -25,7 +25,7 @@ up into 3 parts because of the length of the line): | |||
25 | 25 | ||
26 | 1000 0 54165785 4 cd1e6040 25 4 27 3 -1 | 26 | 1000 0 54165785 4 cd1e6040 25 4 27 3 -1 |
27 | | | | | | | | | | |--> slow start size threshold, | 27 | | | | | | | | | | |--> slow start size threshold, |
28 | | | | | | | | | | or -1 if the treshold | 28 | | | | | | | | | | or -1 if the threshold |
29 | | | | | | | | | | is >= 0xFFFF | 29 | | | | | | | | | | is >= 0xFFFF |
30 | | | | | | | | | |----> sending congestion window | 30 | | | | | | | | | |----> sending congestion window |
31 | | | | | | | | |-------> (ack.quick<<1)|ack.pingpong | 31 | | | | | | | | |-------> (ack.quick<<1)|ack.pingpong |
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 4e1cc745ec63..8590a954df1d 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt | |||
@@ -346,7 +346,7 @@ Possible modes: | |||
346 | depending on the load of the system. If the driver detects that the | 346 | depending on the load of the system. If the driver detects that the |
347 | system load is too high, the driver tries to shield the system against | 347 | system load is too high, the driver tries to shield the system against |
348 | too much network load by enabling interrupt moderation. If - at a later | 348 | too much network load by enabling interrupt moderation. If - at a later |
349 | time - the CPU utilizaton decreases again (or if the network load is | 349 | time - the CPU utilization decreases again (or if the network load is |
350 | negligible) the interrupt moderation will automatically be disabled. | 350 | negligible) the interrupt moderation will automatically be disabled. |
351 | 351 | ||
352 | Interrupt moderation should be used when the driver has to handle one or more | 352 | Interrupt moderation should be used when the driver has to handle one or more |
diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt index 2f04c9267f89..32d3b916afad 100644 --- a/Documentation/networking/slicecom.txt +++ b/Documentation/networking/slicecom.txt | |||
@@ -126,7 +126,7 @@ comx0/boardnum - board number of the SliceCom in the PC (using the 'natural' | |||
126 | 126 | ||
127 | Though the options below are to be set on a single interface, they apply to the | 127 | Though the options below are to be set on a single interface, they apply to the |
128 | whole board. The restriction, to use them on 'UP' interfaces, is because the | 128 | whole board. The restriction, to use them on 'UP' interfaces, is because the |
129 | command sequence below could lead to unpredicable results. | 129 | command sequence below could lead to unpredictable results. |
130 | 130 | ||
131 | # echo 0 >boardnum | 131 | # echo 0 >boardnum |
132 | # echo internal >clock_source | 132 | # echo internal >clock_source |
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt index 0cf654147634..653978dcea7f 100644 --- a/Documentation/networking/wan-router.txt +++ b/Documentation/networking/wan-router.txt | |||
@@ -412,7 +412,7 @@ beta-2.1.4 Jul 2000 o Dynamic interface configuration: | |||
412 | 412 | ||
413 | beta3-2.1.4 Jul 2000 o X25 M_BIT Problem fix. | 413 | beta3-2.1.4 Jul 2000 o X25 M_BIT Problem fix. |
414 | o Added the Multi-Port PPP | 414 | o Added the Multi-Port PPP |
415 | Updated utilites for the Multi-Port PPP. | 415 | Updated utilities for the Multi-Port PPP. |
416 | 416 | ||
417 | 2.1.4 Aut 2000 | 417 | 2.1.4 Aut 2000 |
418 | o In X25API: | 418 | o In X25API: |
@@ -444,13 +444,13 @@ beta1-2.1.5 Nov 15 2000 | |||
444 | 444 | ||
445 | o Cpipemon | 445 | o Cpipemon |
446 | - Added set FT1 commands to the cpipemon. Thus CSU/DSU | 446 | - Added set FT1 commands to the cpipemon. Thus CSU/DSU |
447 | configuraiton can be performed using cpipemon. | 447 | configuration can be performed using cpipemon. |
448 | All systems that cannot run cfgft1 GUI utility should | 448 | All systems that cannot run cfgft1 GUI utility should |
449 | use cpipemon to configure the on board CSU/DSU. | 449 | use cpipemon to configure the on board CSU/DSU. |
450 | 450 | ||
451 | 451 | ||
452 | o Keyboard Led Monitor/Debugger | 452 | o Keyboard Led Monitor/Debugger |
453 | - A new utilty /usr/sbin/wpkbdmon uses keyboard leds | 453 | - A new utility /usr/sbin/wpkbdmon uses keyboard leds |
454 | to convey operational statistic information of the | 454 | to convey operational statistic information of the |
455 | Sangoma WANPIPE cards. | 455 | Sangoma WANPIPE cards. |
456 | NUM_LOCK = Line State (On=connected, Off=disconnected) | 456 | NUM_LOCK = Line State (On=connected, Off=disconnected) |
@@ -464,7 +464,7 @@ beta1-2.1.5 Nov 15 2000 | |||
464 | - Appropriate number of devices are dynamically loaded | 464 | - Appropriate number of devices are dynamically loaded |
465 | based on the number of Sangoma cards found. | 465 | based on the number of Sangoma cards found. |
466 | 466 | ||
467 | Note: The kernel configuraiton option | 467 | Note: The kernel configuration option |
468 | CONFIG_WANPIPE_CARDS has been taken out. | 468 | CONFIG_WANPIPE_CARDS has been taken out. |
469 | 469 | ||
470 | o Fixed the Frame Relay and Chdlc network interfaces so they are | 470 | o Fixed the Frame Relay and Chdlc network interfaces so they are |
diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt index 9ff966bf76e6..28037aa1846c 100644 --- a/Documentation/pnp.txt +++ b/Documentation/pnp.txt | |||
@@ -184,7 +184,7 @@ static const struct pnp_id pnp_dev_table[] = { | |||
184 | Please note that the character 'X' can be used as a wild card in the function | 184 | Please note that the character 'X' can be used as a wild card in the function |
185 | portion (last four characters). | 185 | portion (last four characters). |
186 | ex: | 186 | ex: |
187 | /* Unkown PnP modems */ | 187 | /* Unknown PnP modems */ |
188 | { "PNPCXXX", UNKNOWN_DEV }, | 188 | { "PNPCXXX", UNKNOWN_DEV }, |
189 | 189 | ||
190 | Supported PnP card IDs can optionally be defined. | 190 | Supported PnP card IDs can optionally be defined. |
diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt index 24edf25b3bb7..c750f9f2e76e 100644 --- a/Documentation/power/pci.txt +++ b/Documentation/power/pci.txt | |||
@@ -153,7 +153,7 @@ Description: | |||
153 | events, which is implicit if it doesn't even support it in the first | 153 | events, which is implicit if it doesn't even support it in the first |
154 | place). | 154 | place). |
155 | 155 | ||
156 | Note that the PMC Register in the device's PM Capabilties has a bitmask | 156 | Note that the PMC Register in the device's PM Capabilities has a bitmask |
157 | of the states it supports generating PME# from. D3hot is bit 3 and | 157 | of the states it supports generating PME# from. D3hot is bit 3 and |
158 | D3cold is bit 4. So, while a value of 4 as the state may not seem | 158 | D3cold is bit 4. So, while a value of 4 as the state may not seem |
159 | semantically correct, it is. | 159 | semantically correct, it is. |
@@ -268,7 +268,7 @@ to wake the system up. (However, it is possible that a device may support | |||
268 | some non-standard way of generating a wake event on sleep.) | 268 | some non-standard way of generating a wake event on sleep.) |
269 | 269 | ||
270 | Bits 15:11 of the PMC (Power Mgmt Capabilities) Register in a device's | 270 | Bits 15:11 of the PMC (Power Mgmt Capabilities) Register in a device's |
271 | PM Capabilties describe what power states the device supports generating a | 271 | PM Capabilities describe what power states the device supports generating a |
272 | wake event from: | 272 | wake event from: |
273 | 273 | ||
274 | +------------------+ | 274 | +------------------+ |
diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt index 3e5e5d3ff419..0931a330d362 100644 --- a/Documentation/power/states.txt +++ b/Documentation/power/states.txt | |||
@@ -62,7 +62,7 @@ setup via another operating system for it to use. Despite the | |||
62 | inconvenience, this method requires minimal work by the kernel, since | 62 | inconvenience, this method requires minimal work by the kernel, since |
63 | the firmware will also handle restoring memory contents on resume. | 63 | the firmware will also handle restoring memory contents on resume. |
64 | 64 | ||
65 | If the kernel is responsible for persistantly saving state, a mechanism | 65 | If the kernel is responsible for persistently saving state, a mechanism |
66 | called 'swsusp' (Swap Suspend) is used to write memory contents to | 66 | called 'swsusp' (Swap Suspend) is used to write memory contents to |
67 | free swap space. swsusp has some restrictive requirements, but should | 67 | free swap space. swsusp has some restrictive requirements, but should |
68 | work in most cases. Some, albeit outdated, documentation can be found | 68 | work in most cases. Some, albeit outdated, documentation can be found |
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 9ea2208b43b5..e635e6f1e316 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -153,7 +153,7 @@ add: | |||
153 | 153 | ||
154 | If the thread is needed for writing the image to storage, you should | 154 | If the thread is needed for writing the image to storage, you should |
155 | instead set the PF_NOFREEZE process flag when creating the thread (and | 155 | instead set the PF_NOFREEZE process flag when creating the thread (and |
156 | be very carefull). | 156 | be very careful). |
157 | 157 | ||
158 | 158 | ||
159 | Q: What is the difference between "platform", "shutdown" and | 159 | Q: What is the difference between "platform", "shutdown" and |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 27b457c09729..4ac2d641fcb6 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -33,13 +33,13 @@ | |||
33 | - Change version 16 format to always align | 33 | - Change version 16 format to always align |
34 | property data to 4 bytes. Since tokens are | 34 | property data to 4 bytes. Since tokens are |
35 | already aligned, that means no specific | 35 | already aligned, that means no specific |
36 | required alignement between property size | 36 | required alignment between property size |
37 | and property data. The old style variable | 37 | and property data. The old style variable |
38 | alignment would make it impossible to do | 38 | alignment would make it impossible to do |
39 | "simple" insertion of properties using | 39 | "simple" insertion of properties using |
40 | memove (thanks Milton for | 40 | memove (thanks Milton for |
41 | noticing). Updated kernel patch as well | 41 | noticing). Updated kernel patch as well |
42 | - Correct a few more alignement constraints | 42 | - Correct a few more alignment constraints |
43 | - Add a chapter about the device-tree | 43 | - Add a chapter about the device-tree |
44 | compiler and the textural representation of | 44 | compiler and the textural representation of |
45 | the tree that can be "compiled" by dtc. | 45 | the tree that can be "compiled" by dtc. |
@@ -854,7 +854,7 @@ address which can extend beyond that limit. | |||
854 | console device if any. Typically, if you have serial devices on | 854 | console device if any. Typically, if you have serial devices on |
855 | your board, you may want to put the full path to the one set as | 855 | your board, you may want to put the full path to the one set as |
856 | the default console in the firmware here, for the kernel to pick | 856 | the default console in the firmware here, for the kernel to pick |
857 | it up as it's own default console. If you look at the funciton | 857 | it up as its own default console. If you look at the function |
858 | set_preferred_console() in arch/ppc64/kernel/setup.c, you'll see | 858 | set_preferred_console() in arch/ppc64/kernel/setup.c, you'll see |
859 | that the kernel tries to find out the default console and has | 859 | that the kernel tries to find out the default console and has |
860 | knowledge of various types like 8250 serial ports. You may want | 860 | knowledge of various types like 8250 serial ports. You may want |
@@ -1124,7 +1124,7 @@ should have the following properties: | |||
1124 | - interrupt-parent : contains the phandle of the interrupt | 1124 | - interrupt-parent : contains the phandle of the interrupt |
1125 | controller which handles interrupts for this device | 1125 | controller which handles interrupts for this device |
1126 | - interrupts : a list of tuples representing the interrupt | 1126 | - interrupts : a list of tuples representing the interrupt |
1127 | number and the interrupt sense and level for each interupt | 1127 | number and the interrupt sense and level for each interrupt |
1128 | for this device. | 1128 | for this device. |
1129 | 1129 | ||
1130 | This information is used by the kernel to build the interrupt table | 1130 | This information is used by the kernel to build the interrupt table |
diff --git a/Documentation/robust-futex-ABI.txt b/Documentation/robust-futex-ABI.txt index 8529a17ffaa1..535f69fab45f 100644 --- a/Documentation/robust-futex-ABI.txt +++ b/Documentation/robust-futex-ABI.txt | |||
@@ -170,7 +170,7 @@ any point: | |||
170 | 1) the 'head' pointer or an subsequent linked list pointer | 170 | 1) the 'head' pointer or an subsequent linked list pointer |
171 | is not a valid address of a user space word | 171 | is not a valid address of a user space word |
172 | 2) the calculated location of the 'lock word' (address plus | 172 | 2) the calculated location of the 'lock word' (address plus |
173 | 'offset') is not the valud address of a 32 bit user space | 173 | 'offset') is not the valid address of a 32 bit user space |
174 | word | 174 | word |
175 | 3) if the list contains more than 1 million (subject to | 175 | 3) if the list contains more than 1 million (subject to |
176 | future kernel configuration changes) elements. | 176 | future kernel configuration changes) elements. |
diff --git a/Documentation/robust-futexes.txt b/Documentation/robust-futexes.txt index 76e8064b8c3a..0a9446a53bd1 100644 --- a/Documentation/robust-futexes.txt +++ b/Documentation/robust-futexes.txt | |||
@@ -181,7 +181,7 @@ for new threads, without the need of another syscall.] | |||
181 | So there is virtually zero overhead for tasks not using robust futexes, | 181 | So there is virtually zero overhead for tasks not using robust futexes, |
182 | and even for robust futex users, there is only one extra syscall per | 182 | and even for robust futex users, there is only one extra syscall per |
183 | thread lifetime, and the cleanup operation, if it happens, is fast and | 183 | thread lifetime, and the cleanup operation, if it happens, is fast and |
184 | straightforward. The kernel doesnt have any internal distinction between | 184 | straightforward. The kernel doesn't have any internal distinction between |
185 | robust and normal futexes. | 185 | robust and normal futexes. |
186 | 186 | ||
187 | If a futex is found to be held at exit time, the kernel sets the | 187 | If a futex is found to be held at exit time, the kernel sets the |
diff --git a/Documentation/s390/crypto/crypto-API.txt b/Documentation/s390/crypto/crypto-API.txt index 29dee792c887..41a8b07da05a 100644 --- a/Documentation/s390/crypto/crypto-API.txt +++ b/Documentation/s390/crypto/crypto-API.txt | |||
@@ -75,8 +75,8 @@ name of the respective module is given in square brackets. | |||
75 | 75 | ||
76 | - SHA1 Digest Algorithm [sha1 -> sha1_z990] | 76 | - SHA1 Digest Algorithm [sha1 -> sha1_z990] |
77 | - DES Encrypt/Decrypt Algorithm (64bit key) [des -> des_z990] | 77 | - DES Encrypt/Decrypt Algorithm (64bit key) [des -> des_z990] |
78 | - Tripple DES Encrypt/Decrypt Algorithm (128bit key) [des3_ede128 -> des_z990] | 78 | - Triple DES Encrypt/Decrypt Algorithm (128bit key) [des3_ede128 -> des_z990] |
79 | - Tripple DES Encrypt/Decrypt Algorithm (192bit key) [des3_ede -> des_z990] | 79 | - Triple DES Encrypt/Decrypt Algorithm (192bit key) [des3_ede -> des_z990] |
80 | 80 | ||
81 | In order to load, for example, the sha1_z990 module when the sha1 algorithm is | 81 | In order to load, for example, the sha1_z990 module when the sha1 algorithm is |
82 | requested (see 3.2.) add 'alias sha1 sha1_z990' to /etc/modprobe.conf. | 82 | requested (see 3.2.) add 'alias sha1 sha1_z990' to /etc/modprobe.conf. |
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt index 904d49e90ef2..6aa9a891f3d0 100644 --- a/Documentation/scsi/aic79xx.txt +++ b/Documentation/scsi/aic79xx.txt | |||
@@ -127,7 +127,7 @@ The following information is available in this file: | |||
127 | - Correct a reference to free'ed memory during controller | 127 | - Correct a reference to free'ed memory during controller |
128 | shutdown. | 128 | shutdown. |
129 | - Reset the bus on an SE->LVD change. This is required | 129 | - Reset the bus on an SE->LVD change. This is required |
130 | to reset our transcievers. | 130 | to reset our transceivers. |
131 | 131 | ||
132 | 1.3.5 (March 24th, 2003) | 132 | 1.3.5 (March 24th, 2003) |
133 | - Fix a few register window mode bugs. | 133 | - Fix a few register window mode bugs. |
@@ -169,7 +169,7 @@ The following information is available in this file: | |||
169 | 1.3.0 (January 21st, 2003) | 169 | 1.3.0 (January 21st, 2003) |
170 | - Full regression testing for all U320 products completed. | 170 | - Full regression testing for all U320 products completed. |
171 | - Added abort and target/lun reset error recovery handler and | 171 | - Added abort and target/lun reset error recovery handler and |
172 | interrupt coalessing. | 172 | interrupt coalescing. |
173 | 173 | ||
174 | 1.2.0 (November 14th, 2002) | 174 | 1.2.0 (November 14th, 2002) |
175 | - Added support for Domain Validation | 175 | - Added support for Domain Validation |
diff --git a/Documentation/scsi/aic7xxx_old.txt b/Documentation/scsi/aic7xxx_old.txt index c92f4473193b..05667e7308d4 100644 --- a/Documentation/scsi/aic7xxx_old.txt +++ b/Documentation/scsi/aic7xxx_old.txt | |||
@@ -256,7 +256,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD | |||
256 | En/Disable High Byte LVD Termination | 256 | En/Disable High Byte LVD Termination |
257 | 257 | ||
258 | The upper 2 bits that deal with LVD termination only apply to Ultra2 | 258 | The upper 2 bits that deal with LVD termination only apply to Ultra2 |
259 | controllers. Futhermore, due to the current Ultra2 controller | 259 | controllers. Furthermore, due to the current Ultra2 controller |
260 | designs, these bits are tied together such that setting either bit | 260 | designs, these bits are tied together such that setting either bit |
261 | enables both low and high byte LVD termination. It is not possible | 261 | enables both low and high byte LVD termination. It is not possible |
262 | to only set high or low byte LVD termination in this manner. This is | 262 | to only set high or low byte LVD termination in this manner. This is |
@@ -436,7 +436,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD | |||
436 | the commas to periods, insmod won't interpret this as more than one | 436 | the commas to periods, insmod won't interpret this as more than one |
437 | string and write junk into our binary image. I consider it a bug in | 437 | string and write junk into our binary image. I consider it a bug in |
438 | the insmod program that even if you wrap your string in quotes (quotes | 438 | the insmod program that even if you wrap your string in quotes (quotes |
439 | that pass the shell mind you and that insmod sees) it still treates | 439 | that pass the shell mind you and that insmod sees) it still treats |
440 | a comma inside of those quotes as starting a new variable, resulting | 440 | a comma inside of those quotes as starting a new variable, resulting |
441 | in memory scribbles if you don't switch the commas to periods. | 441 | in memory scribbles if you don't switch the commas to periods. |
442 | 442 | ||
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt index 35f6b8ed2295..9707941704e3 100644 --- a/Documentation/scsi/ibmmca.txt +++ b/Documentation/scsi/ibmmca.txt | |||
@@ -461,7 +461,7 @@ | |||
461 | This needs the RD-Bit to be disabled on IM_OTHER_SCSI_CMD_CMD which | 461 | This needs the RD-Bit to be disabled on IM_OTHER_SCSI_CMD_CMD which |
462 | allows data to be written from the system to the device. It is a | 462 | allows data to be written from the system to the device. It is a |
463 | necessary step to be allowed to set blocksize of SCSI-tape-drives and | 463 | necessary step to be allowed to set blocksize of SCSI-tape-drives and |
464 | the tape-speed, whithout confusing the SCSI-Subsystem. | 464 | the tape-speed, without confusing the SCSI-Subsystem. |
465 | 2) The recognition of a tape is included in the check_devices routine. | 465 | 2) The recognition of a tape is included in the check_devices routine. |
466 | This is done by checking for TYPE_TAPE, that is already defined in | 466 | This is done by checking for TYPE_TAPE, that is already defined in |
467 | the kernel-scsi-environment. The markup of a tape is done in the | 467 | the kernel-scsi-environment. The markup of a tape is done in the |
@@ -710,8 +710,8 @@ | |||
710 | of troubles with some controllers and after I wanted to apply some | 710 | of troubles with some controllers and after I wanted to apply some |
711 | extensions, it jumped out in the same situation, on my w/cache, as like | 711 | extensions, it jumped out in the same situation, on my w/cache, as like |
712 | on D. Weinehalls' Model 56, having integrated SCSI. This gave me the | 712 | on D. Weinehalls' Model 56, having integrated SCSI. This gave me the |
713 | descissive hint to move the code-part out and declare it global. Now, | 713 | decisive hint to move the code-part out and declare it global. Now |
714 | it seems to work by far much better an more stable. Let us see, what | 714 | it seems to work far better and more stable. Let us see what |
715 | the world thinks of it... | 715 | the world thinks of it... |
716 | 3) By the way, only Sony DAT-drives seem to show density code 0x13. A | 716 | 3) By the way, only Sony DAT-drives seem to show density code 0x13. A |
717 | test with a HP drive gave right results, so the problem is vendor- | 717 | test with a HP drive gave right results, so the problem is vendor- |
@@ -822,10 +822,10 @@ | |||
822 | A long period of collecting bugreports from all corners of the world | 822 | A long period of collecting bugreports from all corners of the world |
823 | now lead to the following corrections to the code: | 823 | now lead to the following corrections to the code: |
824 | 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this | 824 | 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this |
825 | was, that it is possible to disbale Fast-SCSI for the external bus. | 825 | was that it is possible to disable Fast-SCSI for the external bus. |
826 | The feature-control command, where this crash appeared regularly tried | 826 | The feature-control command, where this crash appeared regularly, tried |
827 | to set the maximum speed of 10MHz synchronous transfer speed and that | 827 | to set the maximum speed of 10MHz synchronous transfer speed and that |
828 | reports a COMMAND ERROR, if external bus Fast-SCSI is disabled. Now, | 828 | reports a COMMAND ERROR if external bus Fast-SCSI is disabled. Now, |
829 | the feature-command probes down from maximum speed until the adapter | 829 | the feature-command probes down from maximum speed until the adapter |
830 | stops to complain, which is at the same time the maximum possible | 830 | stops to complain, which is at the same time the maximum possible |
831 | speed selected in the reference program. So, F/W external can run at | 831 | speed selected in the reference program. So, F/W external can run at |
@@ -920,7 +920,7 @@ | |||
920 | completed in such a way, that they are now completely conform to the | 920 | completed in such a way, that they are now completely conform to the |
921 | demands in the technical description of IBM. Main candidates were the | 921 | demands in the technical description of IBM. Main candidates were the |
922 | DEVICE_INQUIRY, REQUEST_SENSE and DEVICE_CAPACITY commands. They must | 922 | DEVICE_INQUIRY, REQUEST_SENSE and DEVICE_CAPACITY commands. They must |
923 | be tranferred by bypassing the internal command buffer of the adapter | 923 | be transferred by bypassing the internal command buffer of the adapter |
924 | or else the response can be a random result. GET_POS_INFO would be more | 924 | or else the response can be a random result. GET_POS_INFO would be more |
925 | safe in usage, if one could use the SUPRESS_EXCEPTION_SHORT, but this | 925 | safe in usage, if one could use the SUPRESS_EXCEPTION_SHORT, but this |
926 | is not allowed by the technical references of IBM. (Sorry, folks, the | 926 | is not allowed by the technical references of IBM. (Sorry, folks, the |
diff --git a/Documentation/scsi/in2000.txt b/Documentation/scsi/in2000.txt index 80f104042645..c3e2a90475d2 100644 --- a/Documentation/scsi/in2000.txt +++ b/Documentation/scsi/in2000.txt | |||
@@ -24,7 +24,7 @@ UPDATE NEWS: version 1.32 - 28 Mar 98 | |||
24 | UPDATE NEWS: version 1.31 - 6 Jul 97 | 24 | UPDATE NEWS: version 1.31 - 6 Jul 97 |
25 | 25 | ||
26 | Fixed a bug that caused incorrect SCSI status bytes to be | 26 | Fixed a bug that caused incorrect SCSI status bytes to be |
27 | returned from commands sent to LUN's greater than 0. This | 27 | returned from commands sent to LUNs greater than 0. This |
28 | means that CDROM changers work now! Fixed a bug in the | 28 | means that CDROM changers work now! Fixed a bug in the |
29 | handling of command-line arguments when loaded as a module. | 29 | handling of command-line arguments when loaded as a module. |
30 | Also put all the header data in in2000.h where it belongs. | 30 | Also put all the header data in in2000.h where it belongs. |
diff --git a/Documentation/scsi/libsas.txt b/Documentation/scsi/libsas.txt index 9e2078b2a615..aa54f54c4a50 100644 --- a/Documentation/scsi/libsas.txt +++ b/Documentation/scsi/libsas.txt | |||
@@ -393,7 +393,7 @@ struct sas_task { | |||
393 | task_proto -- _one_ of enum sas_proto | 393 | task_proto -- _one_ of enum sas_proto |
394 | scatter -- pointer to scatter gather list array | 394 | scatter -- pointer to scatter gather list array |
395 | num_scatter -- number of elements in scatter | 395 | num_scatter -- number of elements in scatter |
396 | total_xfer_len -- total number of bytes expected to be transfered | 396 | total_xfer_len -- total number of bytes expected to be transferred |
397 | data_dir -- PCI_DMA_... | 397 | data_dir -- PCI_DMA_... |
398 | task_done -- callback when the task has finished execution | 398 | task_done -- callback when the task has finished execution |
399 | }; | 399 | }; |
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 58ad8db333d9..caf10b155185 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt | |||
@@ -115,7 +115,7 @@ SCSI standard documentations are available at SYMBIOS ftp server: | |||
115 | 115 | ||
116 | ftp://ftp.symbios.com/ | 116 | ftp://ftp.symbios.com/ |
117 | 117 | ||
118 | Usefull SCSI tools written by Eric Youngdale are available at tsx-11: | 118 | Useful SCSI tools written by Eric Youngdale are available at tsx-11: |
119 | 119 | ||
120 | ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/scsiinfo-X.Y.tar.gz | 120 | ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/scsiinfo-X.Y.tar.gz |
121 | ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/scsidev-X.Y.tar.gz | 121 | ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/scsidev-X.Y.tar.gz |
diff --git a/Documentation/scsi/scsi-changer.txt b/Documentation/scsi/scsi-changer.txt index d74bbd29eb3a..032399b16a53 100644 --- a/Documentation/scsi/scsi-changer.txt +++ b/Documentation/scsi/scsi-changer.txt | |||
@@ -88,7 +88,7 @@ If the module finds the changer, it prints some messages about the | |||
88 | device [ try "dmesg" if you don't see anything ] and should show up in | 88 | device [ try "dmesg" if you don't see anything ] and should show up in |
89 | /proc/devices. If not.... some changers use ID ? / LUN 0 for the | 89 | /proc/devices. If not.... some changers use ID ? / LUN 0 for the |
90 | device and ID ? / LUN 1 for the robot mechanism. But Linux does *not* | 90 | device and ID ? / LUN 1 for the robot mechanism. But Linux does *not* |
91 | look for LUN's other than 0 as default, becauce there are to many | 91 | look for LUNs other than 0 as default, because there are too many |
92 | broken devices. So you can try: | 92 | broken devices. So you can try: |
93 | 93 | ||
94 | 1) echo "scsi add-single-device 0 0 ID 1" > /proc/scsi/scsi | 94 | 1) echo "scsi add-single-device 0 0 ID 1" > /proc/scsi/scsi |
@@ -107,7 +107,7 @@ because the kernel will translate the error codes into human-readable | |||
107 | strings then. | 107 | strings then. |
108 | 108 | ||
109 | You can display these messages with the dmesg command (or check the | 109 | You can display these messages with the dmesg command (or check the |
110 | logfiles). If you email me some question becauce of a problem with the | 110 | logfiles). If you email me some question because of a problem with the |
111 | driver, please include these messages. | 111 | driver, please include these messages. |
112 | 112 | ||
113 | 113 | ||
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt index b964eef2f62f..7acbebb17fa6 100644 --- a/Documentation/scsi/scsi_eh.txt +++ b/Documentation/scsi/scsi_eh.txt | |||
@@ -75,7 +75,7 @@ with the command. | |||
75 | 75 | ||
76 | - otherwise | 76 | - otherwise |
77 | scsi_eh_scmd_add(scmd, 0) is invoked for the command. See | 77 | scsi_eh_scmd_add(scmd, 0) is invoked for the command. See |
78 | [1-3] for details of this funciton. | 78 | [1-3] for details of this function. |
79 | 79 | ||
80 | 80 | ||
81 | [1-2-2] Completing a scmd w/ timeout | 81 | [1-2-2] Completing a scmd w/ timeout |
diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt index 5ff65b184265..3c12422f7f41 100644 --- a/Documentation/scsi/st.txt +++ b/Documentation/scsi/st.txt | |||
@@ -261,7 +261,7 @@ pairs are separated with a comma (no spaces allowed). A colon can be | |||
261 | used instead of the equal mark. The definition is prepended by the | 261 | used instead of the equal mark. The definition is prepended by the |
262 | string st=. Here is an example: | 262 | string st=. Here is an example: |
263 | 263 | ||
264 | st=buffer_kbs:64,write_threhold_kbs:60 | 264 | st=buffer_kbs:64,write_threshold_kbs:60 |
265 | 265 | ||
266 | The following syntax used by the old kernel versions is also supported: | 266 | The following syntax used by the old kernel versions is also supported: |
267 | 267 | ||
diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt index 26c8a08ca3ea..2c1745a9df00 100644 --- a/Documentation/scsi/sym53c8xx_2.txt +++ b/Documentation/scsi/sym53c8xx_2.txt | |||
@@ -609,7 +609,7 @@ appropriate mailing lists or news-groups. Send me a copy in order to | |||
609 | be sure I will receive it. Obviously, a bug in the driver code is | 609 | be sure I will receive it. Obviously, a bug in the driver code is |
610 | possible. | 610 | possible. |
611 | 611 | ||
612 | My cyrrent email address: Gerard Roudier <groudier@free.fr> | 612 | My current email address: Gerard Roudier <groudier@free.fr> |
613 | 613 | ||
614 | Allowing disconnections is important if you use several devices on | 614 | Allowing disconnections is important if you use several devices on |
615 | your SCSI bus but often causes problems with buggy devices. | 615 | your SCSI bus but often causes problems with buggy devices. |
diff --git a/Documentation/sharedsubtree.txt b/Documentation/sharedsubtree.txt index 2d8f403eb6eb..ccf1cebe744f 100644 --- a/Documentation/sharedsubtree.txt +++ b/Documentation/sharedsubtree.txt | |||
@@ -942,13 +942,13 @@ replicas continue to be exactly same. | |||
942 | ->mnt_slave | 942 | ->mnt_slave |
943 | ->mnt_master | 943 | ->mnt_master |
944 | 944 | ||
945 | ->mnt_share links togather all the mount to/from which this vfsmount | 945 | ->mnt_share links together all the mount to/from which this vfsmount |
946 | send/receives propagation events. | 946 | send/receives propagation events. |
947 | 947 | ||
948 | ->mnt_slave_list links all the mounts to which this vfsmount propagates | 948 | ->mnt_slave_list links all the mounts to which this vfsmount propagates |
949 | to. | 949 | to. |
950 | 950 | ||
951 | ->mnt_slave links togather all the slaves that its master vfsmount | 951 | ->mnt_slave links together all the slaves that its master vfsmount |
952 | propagates to. | 952 | propagates to. |
953 | 953 | ||
954 | ->mnt_master points to the master vfsmount from which this vfsmount | 954 | ->mnt_master points to the master vfsmount from which this vfsmount |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 3472d9c4ef1b..9fef210ab50a 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -955,7 +955,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
955 | dmx6fire, dsp24, dsp24_value, dsp24_71, ez8, | 955 | dmx6fire, dsp24, dsp24_value, dsp24_71, ez8, |
956 | phase88, mediastation | 956 | phase88, mediastation |
957 | omni - Omni I/O support for MidiMan M-Audio Delta44/66 | 957 | omni - Omni I/O support for MidiMan M-Audio Delta44/66 |
958 | cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever) | 958 | cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transceiver) |
959 | in msec resolution, default value is 500 (0.5 sec) | 959 | in msec resolution, default value is 500 (0.5 sec) |
960 | 960 | ||
961 | This module supports multiple cards and autoprobe. Note: The consumer part | 961 | This module supports multiple cards and autoprobe. Note: The consumer part |
diff --git a/Documentation/sound/alsa/Audigy-mixer.txt b/Documentation/sound/alsa/Audigy-mixer.txt index 5132fd95e074..7f10dc6ff28c 100644 --- a/Documentation/sound/alsa/Audigy-mixer.txt +++ b/Documentation/sound/alsa/Audigy-mixer.txt | |||
@@ -6,7 +6,7 @@ This is based on SB-Live-mixer.txt. | |||
6 | 6 | ||
7 | The EMU10K2 chips have a DSP part which can be programmed to support | 7 | The EMU10K2 chips have a DSP part which can be programmed to support |
8 | various ways of sample processing, which is described here. | 8 | various ways of sample processing, which is described here. |
9 | (This acticle does not deal with the overall functionality of the | 9 | (This article does not deal with the overall functionality of the |
10 | EMU10K2 chips. See the manuals section for further details.) | 10 | EMU10K2 chips. See the manuals section for further details.) |
11 | 11 | ||
12 | The ALSA driver programs this portion of chip by default code | 12 | The ALSA driver programs this portion of chip by default code |
diff --git a/Documentation/sound/alsa/SB-Live-mixer.txt b/Documentation/sound/alsa/SB-Live-mixer.txt index 651adaf60473..f5639d40521d 100644 --- a/Documentation/sound/alsa/SB-Live-mixer.txt +++ b/Documentation/sound/alsa/SB-Live-mixer.txt | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | The EMU10K1 chips have a DSP part which can be programmed to support | 6 | The EMU10K1 chips have a DSP part which can be programmed to support |
7 | various ways of sample processing, which is described here. | 7 | various ways of sample processing, which is described here. |
8 | (This acticle does not deal with the overall functionality of the | 8 | (This article does not deal with the overall functionality of the |
9 | EMU10K1 chips. See the manuals section for further details.) | 9 | EMU10K1 chips. See the manuals section for further details.) |
10 | 10 | ||
11 | The ALSA driver programs this portion of chip by default code | 11 | The ALSA driver programs this portion of chip by default code |
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 02a481225b0d..c815c5206e84 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt | |||
@@ -50,7 +50,7 @@ Review cycle: | |||
50 | Contact the kernel security team for more details on this procedure. | 50 | Contact the kernel security team for more details on this procedure. |
51 | 51 | ||
52 | 52 | ||
53 | Review committe: | 53 | Review committee: |
54 | 54 | ||
55 | - This is made up of a number of kernel developers who have volunteered for | 55 | - This is made up of a number of kernel developers who have volunteered for |
56 | this task, and a few that haven't. | 56 | this task, and a few that haven't. |
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt index 5c3a51905969..aa986a35e994 100644 --- a/Documentation/sysctl/fs.txt +++ b/Documentation/sysctl/fs.txt | |||
@@ -146,7 +146,7 @@ or otherwise protected/tainted binaries. The modes are | |||
146 | readable by root only. This allows the end user to remove | 146 | readable by root only. This allows the end user to remove |
147 | such a dump but not access it directly. For security reasons | 147 | such a dump but not access it directly. For security reasons |
148 | core dumps in this mode will not overwrite one another or | 148 | core dumps in this mode will not overwrite one another or |
149 | other files. This mode is appropriate when adminstrators are | 149 | other files. This mode is appropriate when administrators are |
150 | attempting to debug problems in a normal environment. | 150 | attempting to debug problems in a normal environment. |
151 | 151 | ||
152 | ============================================================== | 152 | ============================================================== |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 20d0d797f539..e96a341eb7e4 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
@@ -129,7 +129,7 @@ the high water marks for each per cpu page list. | |||
129 | 129 | ||
130 | zone_reclaim_mode: | 130 | zone_reclaim_mode: |
131 | 131 | ||
132 | Zone_reclaim_mode allows to set more or less agressive approaches to | 132 | Zone_reclaim_mode allows someone to set more or less aggressive approaches to |
133 | reclaim memory when a zone runs out of memory. If it is set to zero then no | 133 | reclaim memory when a zone runs out of memory. If it is set to zero then no |
134 | zone reclaim occurs. Allocations will be satisfied from other zones / nodes | 134 | zone reclaim occurs. Allocations will be satisfied from other zones / nodes |
135 | in the system. | 135 | in the system. |
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt index b60590eca18f..628013f944c4 100644 --- a/Documentation/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/uml/UserModeLinux-HOWTO.txt | |||
@@ -1477,7 +1477,7 @@ | |||
1477 | 1477 | ||
1478 | 1478 | ||
1479 | 1479 | ||
1480 | Making it world-writeable looks bad, but it seems not to be | 1480 | Making it world-writable looks bad, but it seems not to be |
1481 | exploitable as a security hole. However, it does allow anyone to cre- | 1481 | exploitable as a security hole. However, it does allow anyone to cre- |
1482 | ate useless tap devices (useless because they can't configure them), | 1482 | ate useless tap devices (useless because they can't configure them), |
1483 | which is a DOS attack. A somewhat more secure alternative would to be | 1483 | which is a DOS attack. A somewhat more secure alternative would to be |
diff --git a/Documentation/usb/hiddev.txt b/Documentation/usb/hiddev.txt index 6a790754e963..6e8c9f1d2f22 100644 --- a/Documentation/usb/hiddev.txt +++ b/Documentation/usb/hiddev.txt | |||
@@ -8,7 +8,7 @@ interfaces, but have similar sorts of communication needs. The two big | |||
8 | examples for this are power devices (especially uninterruptable power | 8 | examples for this are power devices (especially uninterruptable power |
9 | supplies) and monitor control on higher end monitors. | 9 | supplies) and monitor control on higher end monitors. |
10 | 10 | ||
11 | To support these disparite requirements, the Linux USB system provides | 11 | To support these disparate requirements, the Linux USB system provides |
12 | HID events to two separate interfaces: | 12 | HID events to two separate interfaces: |
13 | * the input subsystem, which converts HID events into normal input | 13 | * the input subsystem, which converts HID events into normal input |
14 | device interfaces (such as keyboard, mouse and joystick) and a | 14 | device interfaces (such as keyboard, mouse and joystick) and a |
diff --git a/Documentation/usb/rio.txt b/Documentation/usb/rio.txt index ab21db454694..aee715af7db7 100644 --- a/Documentation/usb/rio.txt +++ b/Documentation/usb/rio.txt | |||
@@ -24,10 +24,10 @@ are in no way responsible for any damage that may occur, no matter how | |||
24 | inconsequential. | 24 | inconsequential. |
25 | 25 | ||
26 | It seems that the Rio has a problem when sending .mp3 with low batteries. | 26 | It seems that the Rio has a problem when sending .mp3 with low batteries. |
27 | I suggest when the batteries are low and want to transfer stuff that you | 27 | I suggest when the batteries are low and you want to transfer stuff that you |
28 | replace it with a fresh one. In my case, what happened is I lost two 16kb | 28 | replace it with a fresh one. In my case, what happened is I lost two 16kb |
29 | blocks (they are no longer usable to store information to it). But I don't | 29 | blocks (they are no longer usable to store information to it). But I don't |
30 | know if thats normal or not. It could simply be a problem with the flash | 30 | know if that's normal or not; it could simply be a problem with the flash |
31 | memory. | 31 | memory. |
32 | 32 | ||
33 | In an extreme case, I left my Rio playing overnight and the batteries wore | 33 | In an extreme case, I left my Rio playing overnight and the batteries wore |
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt index 50436e1663ea..d61f6e7865de 100644 --- a/Documentation/usb/usb-serial.txt +++ b/Documentation/usb/usb-serial.txt | |||
@@ -175,7 +175,7 @@ Keyspan USA-series Serial Adapters | |||
175 | 175 | ||
176 | Current status: | 176 | Current status: |
177 | The USA-18X, USA-28X, USA-19, USA-19W and USA-49W are supported and | 177 | The USA-18X, USA-28X, USA-19, USA-19W and USA-49W are supported and |
178 | have been pretty throughly tested at various baud rates with 8-N-1 | 178 | have been pretty thoroughly tested at various baud rates with 8-N-1 |
179 | character settings. Other character lengths and parity setups are | 179 | character settings. Other character lengths and parity setups are |
180 | presently untested. | 180 | presently untested. |
181 | 181 | ||
@@ -253,7 +253,7 @@ Cypress M8 CY4601 Family Serial Driver | |||
253 | together without hacking the adapter to set the line high. | 253 | together without hacking the adapter to set the line high. |
254 | 254 | ||
255 | The driver is smp safe. Performance with the driver is rather low when using | 255 | The driver is smp safe. Performance with the driver is rather low when using |
256 | it for transfering files. This is being worked on, but I would be willing to | 256 | it for transferring files. This is being worked on, but I would be willing to |
257 | accept patches. An urb queue or packet buffer would likely fit the bill here. | 257 | accept patches. An urb queue or packet buffer would likely fit the bill here. |
258 | 258 | ||
259 | If you have any questions, problems, patches, feature requests, etc. you can | 259 | If you have any questions, problems, patches, feature requests, etc. you can |
@@ -297,7 +297,7 @@ Belkin USB Serial Adapter F5U103 | |||
297 | Parity N,E,O,M,S | 297 | Parity N,E,O,M,S |
298 | Handshake None, Software (XON/XOFF), Hardware (CTSRTS,CTSDTR)* | 298 | Handshake None, Software (XON/XOFF), Hardware (CTSRTS,CTSDTR)* |
299 | Break Set and clear | 299 | Break Set and clear |
300 | Line contrl Input/Output query and control ** | 300 | Line control Input/Output query and control ** |
301 | 301 | ||
302 | * Hardware input flow control is only enabled for firmware | 302 | * Hardware input flow control is only enabled for firmware |
303 | levels above 2.06. Read source code comments describing Belkin | 303 | levels above 2.06. Read source code comments describing Belkin |
@@ -309,7 +309,7 @@ Belkin USB Serial Adapter F5U103 | |||
309 | automatic hardware flow control. | 309 | automatic hardware flow control. |
310 | 310 | ||
311 | TO DO List: | 311 | TO DO List: |
312 | -- Add true modem contol line query capability. Currently tracks the | 312 | -- Add true modem control line query capability. Currently tracks the |
313 | states reported by the interrupt and the states requested. | 313 | states reported by the interrupt and the states requested. |
314 | -- Add error reporting back to application for UART error conditions. | 314 | -- Add error reporting back to application for UART error conditions. |
315 | -- Add support for flush ioctls. | 315 | -- Add support for flush ioctls. |
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index 7e8ae83e9847..8d16f6f3c4ec 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt | |||
@@ -214,7 +214,7 @@ returned value is the temperature in degrees fahrenheit. | |||
214 | 214 | ||
215 | Finally the SETOPTIONS ioctl can be used to control some aspects of | 215 | Finally the SETOPTIONS ioctl can be used to control some aspects of |
216 | the cards operation; right now the pcwd driver is the only one | 216 | the cards operation; right now the pcwd driver is the only one |
217 | supporting thiss ioctl. | 217 | supporting this ioctl. |
218 | 218 | ||
219 | int options = 0; | 219 | int options = 0; |
220 | ioctl(fd, WDIOC_SETOPTIONS, options); | 220 | ioctl(fd, WDIOC_SETOPTIONS, options); |
diff --git a/MAINTAINERS b/MAINTAINERS index e182992ff799..846e77a78710 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -155,16 +155,16 @@ L: netdev@vger.kernel.org | |||
155 | S: Maintained | 155 | S: Maintained |
156 | 156 | ||
157 | 9P FILE SYSTEM | 157 | 9P FILE SYSTEM |
158 | P: Eric Van Hensbergen | 158 | P: Eric Van Hensbergen |
159 | M: ericvh@gmail.com | 159 | M: ericvh@gmail.com |
160 | P: Ron Minnich | 160 | P: Ron Minnich |
161 | M: rminnich@lanl.gov | 161 | M: rminnich@lanl.gov |
162 | P: Latchesar Ionkov | 162 | P: Latchesar Ionkov |
163 | M: lucho@ionkov.net | 163 | M: lucho@ionkov.net |
164 | L: v9fs-developer@lists.sourceforge.net | 164 | L: v9fs-developer@lists.sourceforge.net |
165 | W: http://v9fs.sf.net | 165 | W: http://v9fs.sf.net |
166 | T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git | 166 | T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git |
167 | S: Maintained | 167 | S: Maintained |
168 | 168 | ||
169 | A2232 SERIAL BOARD DRIVER | 169 | A2232 SERIAL BOARD DRIVER |
170 | P: Enver Haase | 170 | P: Enver Haase |
@@ -290,8 +290,8 @@ M: ink@jurassic.park.msu.ru | |||
290 | S: Maintained for 2.4; PCI support for 2.6. | 290 | S: Maintained for 2.4; PCI support for 2.6. |
291 | 291 | ||
292 | AMD GEODE PROCESSOR/CHIPSET SUPPORT | 292 | AMD GEODE PROCESSOR/CHIPSET SUPPORT |
293 | P: Jordan Crouse | 293 | P: Jordan Crouse |
294 | M: info-linux@geode.amd.com | 294 | M: info-linux@geode.amd.com |
295 | L: info-linux@geode.amd.com | 295 | L: info-linux@geode.amd.com |
296 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html | 296 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html |
297 | S: Supported | 297 | S: Supported |
@@ -601,13 +601,13 @@ M: maxk@qualcomm.com | |||
601 | S: Maintained | 601 | S: Maintained |
602 | 602 | ||
603 | BONDING DRIVER | 603 | BONDING DRIVER |
604 | P: Chad Tindel | 604 | P: Chad Tindel |
605 | M: ctindel@users.sourceforge.net | 605 | M: ctindel@users.sourceforge.net |
606 | P: Jay Vosburgh | 606 | P: Jay Vosburgh |
607 | M: fubar@us.ibm.com | 607 | M: fubar@us.ibm.com |
608 | L: bonding-devel@lists.sourceforge.net | 608 | L: bonding-devel@lists.sourceforge.net |
609 | W: http://sourceforge.net/projects/bonding/ | 609 | W: http://sourceforge.net/projects/bonding/ |
610 | S: Supported | 610 | S: Supported |
611 | 611 | ||
612 | BROADBAND PROCESSOR ARCHITECTURE | 612 | BROADBAND PROCESSOR ARCHITECTURE |
613 | P: Arnd Bergmann | 613 | P: Arnd Bergmann |
@@ -744,8 +744,8 @@ W: http://www.bullopensource.org/cpuset/ | |||
744 | S: Supported | 744 | S: Supported |
745 | 745 | ||
746 | CRAMFS FILESYSTEM | 746 | CRAMFS FILESYSTEM |
747 | W: http://sourceforge.net/projects/cramfs/ | 747 | W: http://sourceforge.net/projects/cramfs/ |
748 | S: Orphan | 748 | S: Orphan |
749 | 749 | ||
750 | CRIS PORT | 750 | CRIS PORT |
751 | P: Mikael Starvik | 751 | P: Mikael Starvik |
@@ -1054,11 +1054,11 @@ W: http://sourceforge.net/projects/emu10k1/ | |||
1054 | S: Maintained | 1054 | S: Maintained |
1055 | 1055 | ||
1056 | EMULEX LPFC FC SCSI DRIVER | 1056 | EMULEX LPFC FC SCSI DRIVER |
1057 | P: James Smart | 1057 | P: James Smart |
1058 | M: james.smart@emulex.com | 1058 | M: james.smart@emulex.com |
1059 | L: linux-scsi@vger.kernel.org | 1059 | L: linux-scsi@vger.kernel.org |
1060 | W: http://sourceforge.net/projects/lpfcxxxx | 1060 | W: http://sourceforge.net/projects/lpfcxxxx |
1061 | S: Supported | 1061 | S: Supported |
1062 | 1062 | ||
1063 | EPSON 1355 FRAMEBUFFER DRIVER | 1063 | EPSON 1355 FRAMEBUFFER DRIVER |
1064 | P: Christopher Hoover | 1064 | P: Christopher Hoover |
@@ -1495,16 +1495,16 @@ L: linux-kernel@vger.kernel.org | |||
1495 | S: Maintained | 1495 | S: Maintained |
1496 | 1496 | ||
1497 | INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) | 1497 | INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) |
1498 | P: Sylvain Meyer | 1498 | P: Sylvain Meyer |
1499 | M: sylvain.meyer@worldonline.fr | 1499 | M: sylvain.meyer@worldonline.fr |
1500 | L: linux-fbdev-devel@lists.sourceforge.net | 1500 | L: linux-fbdev-devel@lists.sourceforge.net |
1501 | S: Maintained | 1501 | S: Maintained |
1502 | 1502 | ||
1503 | INTEL 810/815 FRAMEBUFFER DRIVER | 1503 | INTEL 810/815 FRAMEBUFFER DRIVER |
1504 | P: Antonino Daplas | 1504 | P: Antonino Daplas |
1505 | M: adaplas@pol.net | 1505 | M: adaplas@pol.net |
1506 | L: linux-fbdev-devel@lists.sourceforge.net | 1506 | L: linux-fbdev-devel@lists.sourceforge.net |
1507 | S: Maintained | 1507 | S: Maintained |
1508 | 1508 | ||
1509 | INTEL APIC/IOAPIC, LOWLEVEL X86 SMP SUPPORT | 1509 | INTEL APIC/IOAPIC, LOWLEVEL X86 SMP SUPPORT |
1510 | P: Ingo Molnar | 1510 | P: Ingo Molnar |
@@ -1830,11 +1830,11 @@ L: linuxppc-embedded@ozlabs.org | |||
1830 | S: Maintained | 1830 | S: Maintained |
1831 | 1831 | ||
1832 | LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX | 1832 | LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX |
1833 | P: Kumar Gala | 1833 | P: Kumar Gala |
1834 | M: galak@kernel.crashing.org | 1834 | M: galak@kernel.crashing.org |
1835 | W: http://www.penguinppc.org/ | 1835 | W: http://www.penguinppc.org/ |
1836 | L: linuxppc-embedded@ozlabs.org | 1836 | L: linuxppc-embedded@ozlabs.org |
1837 | S: Maintained | 1837 | S: Maintained |
1838 | 1838 | ||
1839 | LINUX FOR POWERPC PA SEMI PWRFICIENT | 1839 | LINUX FOR POWERPC PA SEMI PWRFICIENT |
1840 | P: Olof Johansson | 1840 | P: Olof Johansson |
@@ -1933,10 +1933,10 @@ W: http://www.syskonnect.com | |||
1933 | S: Supported | 1933 | S: Supported |
1934 | 1934 | ||
1935 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 | 1935 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 |
1936 | P: Michael Kerrisk | 1936 | P: Michael Kerrisk |
1937 | M: mtk-manpages@gmx.net | 1937 | M: mtk-manpages@gmx.net |
1938 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages | 1938 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages |
1939 | S: Maintained | 1939 | S: Maintained |
1940 | 1940 | ||
1941 | MARVELL MV643XX ETHERNET DRIVER | 1941 | MARVELL MV643XX ETHERNET DRIVER |
1942 | P: Dale Farnsworth | 1942 | P: Dale Farnsworth |
@@ -1953,11 +1953,11 @@ L: linux-fbdev-devel@lists.sourceforge.net | |||
1953 | S: Maintained | 1953 | S: Maintained |
1954 | 1954 | ||
1955 | MEGARAID SCSI DRIVERS | 1955 | MEGARAID SCSI DRIVERS |
1956 | P: Neela Syam Kolli | 1956 | P: Neela Syam Kolli |
1957 | M: Neela.Kolli@engenio.com | 1957 | M: Neela.Kolli@engenio.com |
1958 | S: linux-scsi@vger.kernel.org | 1958 | S: linux-scsi@vger.kernel.org |
1959 | W: http://megaraid.lsilogic.com | 1959 | W: http://megaraid.lsilogic.com |
1960 | S: Maintained | 1960 | S: Maintained |
1961 | 1961 | ||
1962 | MEMORY MANAGEMENT | 1962 | MEMORY MANAGEMENT |
1963 | L: linux-mm@kvack.org | 1963 | L: linux-mm@kvack.org |
@@ -2186,10 +2186,10 @@ T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git | |||
2186 | S: Maintained | 2186 | S: Maintained |
2187 | 2187 | ||
2188 | NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER | 2188 | NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER |
2189 | P: Antonino Daplas | 2189 | P: Antonino Daplas |
2190 | M: adaplas@pol.net | 2190 | M: adaplas@pol.net |
2191 | L: linux-fbdev-devel@lists.sourceforge.net | 2191 | L: linux-fbdev-devel@lists.sourceforge.net |
2192 | S: Maintained | 2192 | S: Maintained |
2193 | 2193 | ||
2194 | OPENCORES I2C BUS DRIVER | 2194 | OPENCORES I2C BUS DRIVER |
2195 | P: Peter Korsgaard | 2195 | P: Peter Korsgaard |
@@ -2539,10 +2539,10 @@ RISCOM8 DRIVER | |||
2539 | S: Orphan | 2539 | S: Orphan |
2540 | 2540 | ||
2541 | S3 SAVAGE FRAMEBUFFER DRIVER | 2541 | S3 SAVAGE FRAMEBUFFER DRIVER |
2542 | P: Antonino Daplas | 2542 | P: Antonino Daplas |
2543 | M: adaplas@pol.net | 2543 | M: adaplas@pol.net |
2544 | L: linux-fbdev-devel@lists.sourceforge.net | 2544 | L: linux-fbdev-devel@lists.sourceforge.net |
2545 | S: Maintained | 2545 | S: Maintained |
2546 | 2546 | ||
2547 | S390 | 2547 | S390 |
2548 | P: Martin Schwidefsky | 2548 | P: Martin Schwidefsky |
@@ -2623,10 +2623,10 @@ L: linux-scsi@vger.kernel.org | |||
2623 | S: Maintained | 2623 | S: Maintained |
2624 | 2624 | ||
2625 | SCTP PROTOCOL | 2625 | SCTP PROTOCOL |
2626 | P: Sridhar Samudrala | 2626 | P: Sridhar Samudrala |
2627 | M: sri@us.ibm.com | 2627 | M: sri@us.ibm.com |
2628 | L: lksctp-developers@lists.sourceforge.net | 2628 | L: lksctp-developers@lists.sourceforge.net |
2629 | S: Supported | 2629 | S: Supported |
2630 | 2630 | ||
2631 | SCx200 CPU SUPPORT | 2631 | SCx200 CPU SUPPORT |
2632 | P: Jim Cromie | 2632 | P: Jim Cromie |
@@ -2794,9 +2794,9 @@ L: tpmdd-devel@lists.sourceforge.net | |||
2794 | S: Maintained | 2794 | S: Maintained |
2795 | 2795 | ||
2796 | Telecom Clock Driver for MCPL0010 | 2796 | Telecom Clock Driver for MCPL0010 |
2797 | P: Mark Gross | 2797 | P: Mark Gross |
2798 | M: mark.gross@intel.com | 2798 | M: mark.gross@intel.com |
2799 | S: Supported | 2799 | S: Supported |
2800 | 2800 | ||
2801 | TENSILICA XTENSA PORT (xtensa): | 2801 | TENSILICA XTENSA PORT (xtensa): |
2802 | P: Chris Zankel | 2802 | P: Chris Zankel |
@@ -2943,9 +2943,9 @@ L: linux-kernel@vger.kernel.org | |||
2943 | S: Maintained | 2943 | S: Maintained |
2944 | 2944 | ||
2945 | TI PARALLEL LINK CABLE DRIVER | 2945 | TI PARALLEL LINK CABLE DRIVER |
2946 | P: Romain Lievin | 2946 | P: Romain Lievin |
2947 | M: roms@lpg.ticalc.org | 2947 | M: roms@lpg.ticalc.org |
2948 | S: Maintained | 2948 | S: Maintained |
2949 | 2949 | ||
2950 | TIPC NETWORK LAYER | 2950 | TIPC NETWORK LAYER |
2951 | P: Per Liden | 2951 | P: Per Liden |
@@ -2995,12 +2995,12 @@ L: linux-kernel@vger.kernel.org | |||
2995 | S: Maintained | 2995 | S: Maintained |
2996 | 2996 | ||
2997 | TRIVIAL PATCHES | 2997 | TRIVIAL PATCHES |
2998 | P: Adrian Bunk | 2998 | P: Adrian Bunk |
2999 | M: trivial@kernel.org | 2999 | M: trivial@kernel.org |
3000 | L: linux-kernel@vger.kernel.org | 3000 | L: linux-kernel@vger.kernel.org |
3001 | W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/ | 3001 | W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/ |
3002 | T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git | 3002 | T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git |
3003 | S: Maintained | 3003 | S: Maintained |
3004 | 3004 | ||
3005 | TMS380 TOKEN-RING NETWORK DRIVER | 3005 | TMS380 TOKEN-RING NETWORK DRIVER |
3006 | P: Adam Fritzler | 3006 | P: Adam Fritzler |
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 57f23b465392..e316bd93313f 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
@@ -133,7 +133,7 @@ config IXP4XX_INDIRECT_PCI | |||
133 | into the kernel and we can use the standard read[bwl]/write[bwl] | 133 | into the kernel and we can use the standard read[bwl]/write[bwl] |
134 | macros. This is the preferred method due to speed but it | 134 | macros. This is the preferred method due to speed but it |
135 | limits the system to just 64MB of PCI memory. This can be | 135 | limits the system to just 64MB of PCI memory. This can be |
136 | problamatic if using video cards and other memory-heavy devices. | 136 | problematic if using video cards and other memory-heavy devices. |
137 | 137 | ||
138 | 2) If > 64MB of memory space is required, the IXP4xx can be | 138 | 2) If > 64MB of memory space is required, the IXP4xx can be |
139 | configured to use indirect registers to access PCI This allows | 139 | configured to use indirect registers to access PCI This allows |
diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig index 147b01928a9b..6f4c6a1798c1 100644 --- a/arch/arm/mach-lh7a40x/Kconfig +++ b/arch/arm/mach-lh7a40x/Kconfig | |||
@@ -8,7 +8,7 @@ config MACH_KEV7A400 | |||
8 | help | 8 | help |
9 | Say Y here if you are using the Sharp KEV7A400 development | 9 | Say Y here if you are using the Sharp KEV7A400 development |
10 | board. This hardware is discontinued, so I'd be very | 10 | board. This hardware is discontinued, so I'd be very |
11 | suprised if you wanted this option. | 11 | surprised if you wanted this option. |
12 | 12 | ||
13 | config MACH_LPD7A400 | 13 | config MACH_LPD7A400 |
14 | bool "LPD7A400 Card Engine" | 14 | bool "LPD7A400 Card Engine" |
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index 63965c78de8c..9aa26b99045d 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
@@ -91,7 +91,7 @@ config SMDK2440_CPU2442 | |||
91 | config MACH_S3C2413 | 91 | config MACH_S3C2413 |
92 | bool | 92 | bool |
93 | help | 93 | help |
94 | Internal node for S3C2413 verison of SMDK2413, so that | 94 | Internal node for S3C2413 version of SMDK2413, so that |
95 | machine_is_s3c2413() will work when MACH_SMDK2413 is | 95 | machine_is_s3c2413() will work when MACH_SMDK2413 is |
96 | selected | 96 | selected |
97 | 97 | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c0bfb8212b77..b09a19f87d68 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -197,7 +197,7 @@ config CPU_ARM940T | |||
197 | select CPU_CP15_MPU | 197 | select CPU_CP15_MPU |
198 | help | 198 | help |
199 | ARM940T is a member of the ARM9TDMI family of general- | 199 | ARM940T is a member of the ARM9TDMI family of general- |
200 | purpose microprocessors with MPU and seperate 4KB | 200 | purpose microprocessors with MPU and separate 4KB |
201 | instruction and 4KB data cases, each with a 4-word line | 201 | instruction and 4KB data cases, each with a 4-word line |
202 | length. | 202 | length. |
203 | 203 | ||
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig index 44eb1b9accb3..c7ea9efd0104 100644 --- a/arch/cris/arch-v10/Kconfig +++ b/arch/cris/arch-v10/Kconfig | |||
@@ -323,7 +323,7 @@ config ETRAX_DEF_R_WAITSTATES | |||
323 | depends on ETRAX_ARCH_V10 | 323 | depends on ETRAX_ARCH_V10 |
324 | default "95a6" | 324 | default "95a6" |
325 | help | 325 | help |
326 | Waitstates for SRAM, Flash and peripherials (not DRAM). 95f8 is a | 326 | Waitstates for SRAM, Flash and peripherals (not DRAM). 95f8 is a |
327 | good choice for most Axis products... | 327 | good choice for most Axis products... |
328 | 328 | ||
329 | config ETRAX_DEF_R_BUS_CONFIG | 329 | config ETRAX_DEF_R_BUS_CONFIG |
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 734d5f3a5304..e7e724bc0ba6 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
@@ -839,7 +839,7 @@ config ETRAX_DS1302_TRICKLE_CHARGE | |||
839 | default "0" | 839 | default "0" |
840 | help | 840 | help |
841 | This controls the initial value of the trickle charge register. | 841 | This controls the initial value of the trickle charge register. |
842 | 0 = disabled (use this if you are unsure or have a non rechargable battery) | 842 | 0 = disabled (use this if you are unsure or have a non rechargeable battery) |
843 | Otherwise the following values can be OR:ed together to control the | 843 | Otherwise the following values can be OR:ed together to control the |
844 | charge current: | 844 | charge current: |
845 | 1 = 2kohm, 2 = 4kohm, 3 = 4kohm | 845 | 1 = 2kohm, 2 = 4kohm, 3 = 4kohm |
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 6e1f191a71e3..284ebfda03f0 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /*!***************************************************************************** | 1 | /*!***************************************************************************** |
2 | *! | 2 | *! |
3 | *! Implements an interface for i2c compatible eeproms to run under linux. | 3 | *! Implements an interface for i2c compatible eeproms to run under Linux. |
4 | *! Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustents by | 4 | *! Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustments by |
5 | *! Johan.Adolfsson@axis.com | 5 | *! Johan.Adolfsson@axis.com |
6 | *! | 6 | *! |
7 | *! Probing results: | 7 | *! Probing results: |
@@ -51,7 +51,7 @@ | |||
51 | *! Revision 1.8 2001/06/15 13:24:29 jonashg | 51 | *! Revision 1.8 2001/06/15 13:24:29 jonashg |
52 | *! * Added verification of pointers from userspace in read and write. | 52 | *! * Added verification of pointers from userspace in read and write. |
53 | *! * Made busy counter volatile. | 53 | *! * Made busy counter volatile. |
54 | *! * Added define for inital write delay. | 54 | *! * Added define for initial write delay. |
55 | *! * Removed warnings by using loff_t instead of unsigned long. | 55 | *! * Removed warnings by using loff_t instead of unsigned long. |
56 | *! | 56 | *! |
57 | *! Revision 1.7 2001/06/14 15:26:54 jonashg | 57 | *! Revision 1.7 2001/06/14 15:26:54 jonashg |
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c index 6114596c3b33..092c724a645f 100644 --- a/arch/cris/arch-v10/drivers/i2c.c +++ b/arch/cris/arch-v10/drivers/i2c.c | |||
@@ -47,7 +47,7 @@ | |||
47 | *! Update Port B register and shadow even when running with hardware support | 47 | *! Update Port B register and shadow even when running with hardware support |
48 | *! to avoid glitches when reading bits | 48 | *! to avoid glitches when reading bits |
49 | *! Never set direction to out in i2c_inbyte | 49 | *! Never set direction to out in i2c_inbyte |
50 | *! Removed incorrect clock togling at end of i2c_inbyte | 50 | *! Removed incorrect clock toggling at end of i2c_inbyte |
51 | *! | 51 | *! |
52 | *! Revision 1.8 2002/08/13 06:31:53 starvik | 52 | *! Revision 1.8 2002/08/13 06:31:53 starvik |
53 | *! Made SDA and SCL line configurable | 53 | *! Made SDA and SCL line configurable |
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c index 34528da98817..07628a13c6c4 100644 --- a/arch/cris/arch-v10/kernel/kgdb.c +++ b/arch/cris/arch-v10/kernel/kgdb.c | |||
@@ -33,7 +33,7 @@ | |||
33 | *! | 33 | *! |
34 | *! Revision 1.2 2002/11/19 14:35:24 starvik | 34 | *! Revision 1.2 2002/11/19 14:35:24 starvik |
35 | *! Changes from linux 2.4 | 35 | *! Changes from linux 2.4 |
36 | *! Changed struct initializer syntax to the currently prefered notation | 36 | *! Changed struct initializer syntax to the currently preferred notation |
37 | *! | 37 | *! |
38 | *! Revision 1.1 2001/12/17 13:59:27 bjornw | 38 | *! Revision 1.1 2001/12/17 13:59:27 bjornw |
39 | *! Initial revision | 39 | *! Initial revision |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index a33097f95362..f64624fc4504 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -88,7 +88,7 @@ config ETRAX_SERIAL_PORT0_DMA7_IN | |||
88 | help | 88 | help |
89 | Enables the DMA7 input channel for ser0 (ttyS0). | 89 | Enables the DMA7 input channel for ser0 (ttyS0). |
90 | If you do not enable DMA, an interrupt for each character will be | 90 | If you do not enable DMA, an interrupt for each character will be |
91 | used when receiveing data. | 91 | used when receiving data. |
92 | Normally you want to use DMA, unless you use the DMA channel for | 92 | Normally you want to use DMA, unless you use the DMA channel for |
93 | something else. | 93 | something else. |
94 | 94 | ||
@@ -157,7 +157,7 @@ config ETRAX_SERIAL_PORT1_DMA5_IN | |||
157 | help | 157 | help |
158 | Enables the DMA5 input channel for ser1 (ttyS1). | 158 | Enables the DMA5 input channel for ser1 (ttyS1). |
159 | If you do not enable DMA, an interrupt for each character will be | 159 | If you do not enable DMA, an interrupt for each character will be |
160 | used when receiveing data. | 160 | used when receiving data. |
161 | Normally you want this on, unless you use the DMA channel for | 161 | Normally you want this on, unless you use the DMA channel for |
162 | something else. | 162 | something else. |
163 | 163 | ||
@@ -228,7 +228,7 @@ config ETRAX_SERIAL_PORT2_DMA3_IN | |||
228 | help | 228 | help |
229 | Enables the DMA3 input channel for ser2 (ttyS2). | 229 | Enables the DMA3 input channel for ser2 (ttyS2). |
230 | If you do not enable DMA, an interrupt for each character will be | 230 | If you do not enable DMA, an interrupt for each character will be |
231 | used when receiveing data. | 231 | used when receiving data. |
232 | Normally you want to use DMA, unless you use the DMA channel for | 232 | Normally you want to use DMA, unless you use the DMA channel for |
233 | something else. | 233 | something else. |
234 | 234 | ||
@@ -297,7 +297,7 @@ config ETRAX_SERIAL_PORT3_DMA9_IN | |||
297 | help | 297 | help |
298 | Enables the DMA9 input channel for ser3 (ttyS3). | 298 | Enables the DMA9 input channel for ser3 (ttyS3). |
299 | If you do not enable DMA, an interrupt for each character will be | 299 | If you do not enable DMA, an interrupt for each character will be |
300 | used when receiveing data. | 300 | used when receiving data. |
301 | Normally you want to use DMA, unless you use the DMA channel for | 301 | Normally you want to use DMA, unless you use the DMA channel for |
302 | something else. | 302 | something else. |
303 | 303 | ||
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index db8e1fcfa047..14691cda05c3 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -75,7 +75,7 @@ | |||
75 | ** If a device prefetches beyond the end of a valid pdir entry, it will cause | 75 | ** If a device prefetches beyond the end of a valid pdir entry, it will cause |
76 | ** a hard failure, ie. MCA. Version 3.0 and later of the zx1 LBA should | 76 | ** a hard failure, ie. MCA. Version 3.0 and later of the zx1 LBA should |
77 | ** disconnect on 4k boundaries and prevent such issues. If the device is | 77 | ** disconnect on 4k boundaries and prevent such issues. If the device is |
78 | ** particularly agressive, this option will keep the entire pdir valid such | 78 | ** particularly aggressive, this option will keep the entire pdir valid such |
79 | ** that prefetching will hit a valid address. This could severely impact | 79 | ** that prefetching will hit a valid address. This could severely impact |
80 | ** error containment, and is therefore off by default. The page that is | 80 | ** error containment, and is therefore off by default. The page that is |
81 | ** used for spill-over is poisoned, so that should help debugging somewhat. | 81 | ** used for spill-over is poisoned, so that should help debugging somewhat. |
@@ -258,10 +258,10 @@ static u64 prefetch_spill_page; | |||
258 | 258 | ||
259 | /* | 259 | /* |
260 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up | 260 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up |
261 | ** (or rather not merge) DMA's into managable chunks. | 261 | ** (or rather not merge) DMAs into manageable chunks. |
262 | ** On parisc, this is more of the software/tuning constraint | 262 | ** On parisc, this is more of the software/tuning constraint |
263 | ** rather than the HW. I/O MMU allocation alogorithms can be | 263 | ** rather than the HW. I/O MMU allocation algorithms can be |
264 | ** faster with smaller size is (to some degree). | 264 | ** faster with smaller sizes (to some degree). |
265 | */ | 265 | */ |
266 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*iovp_size) | 266 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*iovp_size) |
267 | 267 | ||
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 6d920d4bdc3d..c1bc22c6d0d8 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
@@ -565,7 +565,7 @@ config ROMVEC | |||
565 | depends on ROM | 565 | depends on ROM |
566 | help | 566 | help |
567 | This is almost always the same as the base of the ROM. Since on all | 567 | This is almost always the same as the base of the ROM. Since on all |
568 | 68000 type varients the vectors are at the base of the boot device | 568 | 68000 type variants the vectors are at the base of the boot device |
569 | on system startup. | 569 | on system startup. |
570 | 570 | ||
571 | config ROMVECSIZE | 571 | config ROMVECSIZE |
@@ -574,7 +574,7 @@ config ROMVECSIZE | |||
574 | depends on ROM | 574 | depends on ROM |
575 | help | 575 | help |
576 | Define the size of the vector region in ROM. For most 68000 | 576 | Define the size of the vector region in ROM. For most 68000 |
577 | varients this would be 0x400 bytes in size. Set to 0 if you do | 577 | variants this would be 0x400 bytes in size. Set to 0 if you do |
578 | not want a vector region at the start of the ROM. | 578 | not want a vector region at the start of the ROM. |
579 | 579 | ||
580 | config ROMSTART | 580 | config ROMSTART |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1443024b1c7c..22bb540b5c05 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -865,7 +865,7 @@ config MIPS_DISABLE_OBSOLETE_IDE | |||
865 | bool | 865 | bool |
866 | 866 | ||
867 | # | 867 | # |
868 | # Endianess selection. Suffiently obscure so many users don't know what to | 868 | # Endianess selection. Sufficiently obscure so many users don't know what to |
869 | # answer,so we try hard to limit the available choices. Also the use of a | 869 | # answer,so we try hard to limit the available choices. Also the use of a |
870 | # choice statement should be more obvious to the user. | 870 | # choice statement should be more obvious to the user. |
871 | # | 871 | # |
@@ -874,7 +874,7 @@ choice | |||
874 | help | 874 | help |
875 | Some MIPS machines can be configured for either little or big endian | 875 | Some MIPS machines can be configured for either little or big endian |
876 | byte order. These modes require different kernels and a different | 876 | byte order. These modes require different kernels and a different |
877 | Linux distribution. In general there is one prefered byteorder for a | 877 | Linux distribution. In general there is one preferred byteorder for a |
878 | particular system but some systems are just as commonly used in the | 878 | particular system but some systems are just as commonly used in the |
879 | one or the other endianess. | 879 | one or the other endianess. |
880 | 880 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0673dbedb241..116d7d3683ed 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -425,7 +425,7 @@ config PPC_MAPLE | |||
425 | default n | 425 | default n |
426 | help | 426 | help |
427 | This option enables support for the Maple 970FX Evaluation Board. | 427 | This option enables support for the Maple 970FX Evaluation Board. |
428 | For more informations, refer to <http://www.970eval.com> | 428 | For more information, refer to <http://www.970eval.com> |
429 | 429 | ||
430 | config PPC_PASEMI | 430 | config PPC_PASEMI |
431 | depends on PPC_MULTIPLATFORM && PPC64 | 431 | depends on PPC_MULTIPLATFORM && PPC64 |
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index 7edb6b461382..edcd5b875b66 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig | |||
@@ -21,7 +21,7 @@ config MPC834x_SYS | |||
21 | Be aware that PCI buses can only function when SYS board is plugged | 21 | Be aware that PCI buses can only function when SYS board is plugged |
22 | into the PIB (Platform IO Board) board from Freescale which provide | 22 | into the PIB (Platform IO Board) board from Freescale which provide |
23 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | 23 | 3 PCI slots. The PIBs PCI initialization is the bootloader's |
24 | responsiblilty. | 24 | responsibility. |
25 | 25 | ||
26 | config MPC834x_ITX | 26 | config MPC834x_ITX |
27 | bool "Freescale MPC834x ITX" | 27 | bool "Freescale MPC834x ITX" |
@@ -30,7 +30,7 @@ config MPC834x_ITX | |||
30 | This option enables support for the MPC 834x ITX evaluation board. | 30 | This option enables support for the MPC 834x ITX evaluation board. |
31 | 31 | ||
32 | Be aware that PCI initialization is the bootloader's | 32 | Be aware that PCI initialization is the bootloader's |
33 | responsiblilty. | 33 | responsibility. |
34 | 34 | ||
35 | config MPC8360E_PB | 35 | config MPC8360E_PB |
36 | bool "Freescale MPC8360E PB" | 36 | bool "Freescale MPC8360E PB" |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 077711e63104..ef018e25fb07 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -724,7 +724,7 @@ config MPC834x_SYS | |||
724 | Be aware that PCI buses can only function when SYS board is plugged | 724 | Be aware that PCI buses can only function when SYS board is plugged |
725 | into the PIB (Platform IO Board) board from Freescale which provide | 725 | into the PIB (Platform IO Board) board from Freescale which provide |
726 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | 726 | 3 PCI slots. The PIBs PCI initialization is the bootloader's |
727 | responsiblilty. | 727 | responsibility. |
728 | 728 | ||
729 | config EV64360 | 729 | config EV64360 |
730 | bool "Marvell-EV64360BP" | 730 | bool "Marvell-EV64360BP" |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6a461d4caeff..bffc7e176970 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -217,7 +217,7 @@ config SH_SHMIN | |||
217 | bool "SHMIN" | 217 | bool "SHMIN" |
218 | select CPU_SUBTYPE_SH7706 | 218 | select CPU_SUBTYPE_SH7706 |
219 | help | 219 | help |
220 | Select SHMIN if configureing for the SHMIN board | 220 | Select SHMIN if configuring for the SHMIN board. |
221 | 221 | ||
222 | config SH_UNKNOWN | 222 | config SH_UNKNOWN |
223 | bool "BareCPU" | 223 | bool "BareCPU" |
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c index 1326f45f31eb..4310fc87444e 100644 --- a/arch/sh64/lib/dbg.c +++ b/arch/sh64/lib/dbg.c | |||
@@ -383,7 +383,7 @@ void show_excp_regs(char *from, int trapnr, int signr, struct pt_regs *regs) | |||
383 | /* ======================================================================= */ | 383 | /* ======================================================================= */ |
384 | 384 | ||
385 | /* | 385 | /* |
386 | ** Depending on <base> scan the MMU, Data or Instrction side | 386 | ** Depending on <base> scan the MMU, Data or Instruction side |
387 | ** looking for a valid mapping matching Eaddr & asid. | 387 | ** looking for a valid mapping matching Eaddr & asid. |
388 | ** Return -1 if not found or the TLB id entry otherwise. | 388 | ** Return -1 if not found or the TLB id entry otherwise. |
389 | ** Note: it works only for 4k pages! | 389 | ** Note: it works only for 4k pages! |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2f96610a83e9..92a7c8a636d3 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -212,8 +212,8 @@ config SPARC_LED | |||
212 | tristate "Sun4m LED driver" | 212 | tristate "Sun4m LED driver" |
213 | help | 213 | help |
214 | This driver toggles the front-panel LED on sun4m systems | 214 | This driver toggles the front-panel LED on sun4m systems |
215 | in a user-specifyable manner. It's state can be probed | 215 | in a user-specifiable manner. Its state can be probed |
216 | by reading /proc/led and it's blinking mode can be changed | 216 | by reading /proc/led and its blinking mode can be changed |
217 | via writes to /proc/led | 217 | via writes to /proc/led |
218 | 218 | ||
219 | source "fs/Kconfig.binfmt" | 219 | source "fs/Kconfig.binfmt" |
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 2f880cb167a5..0cad3546cb89 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c | |||
@@ -120,7 +120,7 @@ static int winch_thread(void *arg) | |||
120 | /* These are synchronization calls between various UML threads on the | 120 | /* These are synchronization calls between various UML threads on the |
121 | * host - since they are not different kernel threads, we cannot use | 121 | * host - since they are not different kernel threads, we cannot use |
122 | * kernel semaphores. We don't use SysV semaphores because they are | 122 | * kernel semaphores. We don't use SysV semaphores because they are |
123 | * persistant. */ | 123 | * persistent. */ |
124 | count = os_read_file(pipe_fd, &c, sizeof(c)); | 124 | count = os_read_file(pipe_fd, &c, sizeof(c)); |
125 | if(count != sizeof(c)) | 125 | if(count != sizeof(c)) |
126 | printk("winch_thread : failed to read synchronization byte, " | 126 | printk("winch_thread : failed to read synchronization byte, " |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 9ed1c60048f0..bb7ef570514c 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -305,7 +305,7 @@ static void clear_lockup (struct atm_vcc *vcc, IADEV *dev) { | |||
305 | ** | R | NZ | 5-bit exponent | 9-bit mantissa | | 305 | ** | R | NZ | 5-bit exponent | 9-bit mantissa | |
306 | ** +----+----+------------------+-------------------------------+ | 306 | ** +----+----+------------------+-------------------------------+ |
307 | ** | 307 | ** |
308 | ** R = reserverd (written as 0) | 308 | ** R = reserved (written as 0) |
309 | ** NZ = 0 if 0 cells/sec; 1 otherwise | 309 | ** NZ = 0 if 0 cells/sec; 1 otherwise |
310 | ** | 310 | ** |
311 | ** if NZ = 1, rate = 1.mmmmmmmmm x 2^(eeeee) cells/sec | 311 | ** if NZ = 1, rate = 1.mmmmmmmmm x 2^(eeeee) cells/sec |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 2af12fc45115..ad8b537ad47b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -994,7 +994,7 @@ config HPET | |||
994 | help | 994 | help |
995 | If you say Y here, you will have a miscdevice named "/dev/hpet/". Each | 995 | If you say Y here, you will have a miscdevice named "/dev/hpet/". Each |
996 | open selects one of the timers supported by the HPET. The timers are | 996 | open selects one of the timers supported by the HPET. The timers are |
997 | non-periodioc and/or periodic. | 997 | non-periodic and/or periodic. |
998 | 998 | ||
999 | config HPET_RTC_IRQ | 999 | config HPET_RTC_IRQ |
1000 | bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC | 1000 | bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC |
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index 4df6ab2206a1..167ebc84e8d7 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c | |||
@@ -922,7 +922,7 @@ int RIOUnUse(unsigned long iPortP, struct CmdBlk *CmdBlkP) | |||
922 | ** | 922 | ** |
923 | ** Packet is an actual packet structure to be filled in with the packet | 923 | ** Packet is an actual packet structure to be filled in with the packet |
924 | ** information associated with the command. You need to fill in everything, | 924 | ** information associated with the command. You need to fill in everything, |
925 | ** as the command processore doesn't process the command packet in any way. | 925 | ** as the command processor doesn't process the command packet in any way. |
926 | ** | 926 | ** |
927 | ** The PreFuncP is called before the packet is enqueued on the host rup. | 927 | ** The PreFuncP is called before the packet is enqueued on the host rup. |
928 | ** PreFuncP is called as (*PreFuncP)(PreArg, CmdBlkP);. PreFuncP must | 928 | ** PreFuncP is called as (*PreFuncP)(PreArg, CmdBlkP);. PreFuncP must |
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index 99f3df02b61c..0794844369d6 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c | |||
@@ -222,7 +222,7 @@ int RIOBoardTest(unsigned long paddr, void __iomem *caddr, unsigned char type, i | |||
222 | ** which value will be written into memory. | 222 | ** which value will be written into memory. |
223 | ** Call with op set to zero means that the RAM will not be read and checked | 223 | ** Call with op set to zero means that the RAM will not be read and checked |
224 | ** before it is written. | 224 | ** before it is written. |
225 | ** Call with op not zero, and the RAM will be read and compated with val[op-1] | 225 | ** Call with op not zero and the RAM will be read and compared with val[op-1] |
226 | ** to check that the data from the previous phase was retained. | 226 | ** to check that the data from the previous phase was retained. |
227 | */ | 227 | */ |
228 | 228 | ||
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index 1066d9760704..bb498d24adcc 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c | |||
@@ -87,8 +87,8 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c 1.3"; | |||
87 | ** command bit set onto the port. The command bit is in the len field, | 87 | ** command bit set onto the port. The command bit is in the len field, |
88 | ** and gets ORed in with the actual byte count. | 88 | ** and gets ORed in with the actual byte count. |
89 | ** | 89 | ** |
90 | ** When you send a packet with the command bit set, then the first | 90 | ** When you send a packet with the command bit set the first |
91 | ** data byte ( data[0] ) is interpretted as the command to execute. | 91 | ** data byte (data[0]) is interpreted as the command to execute. |
92 | ** It also governs what data structure overlay should accompany the packet. | 92 | ** It also governs what data structure overlay should accompany the packet. |
93 | ** Commands are defined in cirrus/cirrus.h | 93 | ** Commands are defined in cirrus/cirrus.h |
94 | ** | 94 | ** |
@@ -103,7 +103,7 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c 1.3"; | |||
103 | ** | 103 | ** |
104 | ** Most commands do not use the remaining bytes in the data array. The | 104 | ** Most commands do not use the remaining bytes in the data array. The |
105 | ** exceptions are OPEN MOPEN and CONFIG. (NB. As with the SI CONFIG and | 105 | ** exceptions are OPEN MOPEN and CONFIG. (NB. As with the SI CONFIG and |
106 | ** OPEN are currently analagous). With these three commands the following | 106 | ** OPEN are currently analogous). With these three commands the following |
107 | ** 11 data bytes are all used to pass config information such as baud rate etc. | 107 | ** 11 data bytes are all used to pass config information such as baud rate etc. |
108 | ** The fields are also defined in cirrus.h. Some contain straightforward | 108 | ** The fields are also defined in cirrus.h. Some contain straightforward |
109 | ** information such as the transmit XON character. Two contain the transmit and | 109 | ** information such as the transmit XON character. Two contain the transmit and |
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 8ccee9c769f8..e3a267622bb6 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -1635,7 +1635,7 @@ static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg) | |||
1635 | /* | 1635 | /* |
1636 | ** Get ATAPI_FORMAT_UNIT progress indication. | 1636 | ** Get ATAPI_FORMAT_UNIT progress indication. |
1637 | ** | 1637 | ** |
1638 | ** Userland gives a pointer to an int. The int is set to a progresss | 1638 | ** Userland gives a pointer to an int. The int is set to a progress |
1639 | ** indicator 0-65536, with 65536=100%. | 1639 | ** indicator 0-65536, with 65536=100%. |
1640 | ** | 1640 | ** |
1641 | ** If the drive does not support format progress indication, we just check | 1641 | ** If the drive does not support format progress indication, we just check |
diff --git a/drivers/isdn/hardware/eicon/os_4bri.c b/drivers/isdn/hardware/eicon/os_4bri.c index 11e6f937c1e4..7b4ec3f60dbf 100644 --- a/drivers/isdn/hardware/eicon/os_4bri.c +++ b/drivers/isdn/hardware/eicon/os_4bri.c | |||
@@ -464,7 +464,7 @@ int diva_4bri_init_card(diva_os_xdi_adapter_t * a) | |||
464 | 464 | ||
465 | /* | 465 | /* |
466 | ** Cleanup function will be called for master adapter only | 466 | ** Cleanup function will be called for master adapter only |
467 | ** this is garanteed by design: cleanup callback is set | 467 | ** this is guaranteed by design: cleanup callback is set |
468 | ** by master adapter only | 468 | ** by master adapter only |
469 | */ | 469 | */ |
470 | static int diva_4bri_cleanup_adapter(diva_os_xdi_adapter_t * a) | 470 | static int diva_4bri_cleanup_adapter(diva_os_xdi_adapter_t * a) |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.h b/drivers/isdn/hisax/hfc4s8s_l1.h index e8f9c077fa85..9d5d2a56b4e9 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.h +++ b/drivers/isdn/hisax/hfc4s8s_l1.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | /* | 17 | /* |
18 | * include Genero generated HFC-4S/8S header file hfc48scu.h | 18 | * include Genero generated HFC-4S/8S header file hfc48scu.h |
19 | * for comlete register description. This will define _HFC48SCU_H_ | 19 | * for complete register description. This will define _HFC48SCU_H_ |
20 | * to prevent redefinitions | 20 | * to prevent redefinitions |
21 | */ | 21 | */ |
22 | 22 | ||
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c index 6d0431725555..cd3b5ad53491 100644 --- a/drivers/isdn/hisax/isdnl2.c +++ b/drivers/isdn/hisax/isdnl2.c | |||
@@ -1442,7 +1442,7 @@ l2_tei_remove(struct FsmInst *fi, int event, void *arg) | |||
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | static void | 1444 | static void |
1445 | l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg) | 1445 | l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg) |
1446 | { | 1446 | { |
1447 | struct PStack *st = fi->userdata; | 1447 | struct PStack *st = fi->userdata; |
1448 | 1448 | ||
@@ -1453,7 +1453,7 @@ l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg) | |||
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | static void | 1455 | static void |
1456 | l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg) | 1456 | l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg) |
1457 | { | 1457 | { |
1458 | struct PStack *st = fi->userdata; | 1458 | struct PStack *st = fi->userdata; |
1459 | 1459 | ||
@@ -1466,7 +1466,7 @@ l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg) | |||
1466 | } | 1466 | } |
1467 | 1467 | ||
1468 | static void | 1468 | static void |
1469 | l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg) | 1469 | l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg) |
1470 | { | 1470 | { |
1471 | struct PStack *st = fi->userdata; | 1471 | struct PStack *st = fi->userdata; |
1472 | 1472 | ||
@@ -1477,7 +1477,7 @@ l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg) | |||
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | static void | 1479 | static void |
1480 | l2_persistant_da(struct FsmInst *fi, int event, void *arg) | 1480 | l2_persistent_da(struct FsmInst *fi, int event, void *arg) |
1481 | { | 1481 | { |
1482 | struct PStack *st = fi->userdata; | 1482 | struct PStack *st = fi->userdata; |
1483 | 1483 | ||
@@ -1612,14 +1612,14 @@ static struct FsmNode L2FnList[] __initdata = | |||
1612 | {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error}, | 1612 | {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error}, |
1613 | {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest}, | 1613 | {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest}, |
1614 | {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest}, | 1614 | {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest}, |
1615 | {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da}, | 1615 | {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da}, |
1616 | {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove}, | 1616 | {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove}, |
1617 | {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove}, | 1617 | {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove}, |
1618 | {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da}, | 1618 | {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da}, |
1619 | {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da}, | 1619 | {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da}, |
1620 | {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da}, | 1620 | {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da}, |
1621 | {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da}, | 1621 | {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da}, |
1622 | {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da}, | 1622 | {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, |
1623 | }; | 1623 | }; |
1624 | 1624 | ||
1625 | #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) | 1625 | #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) |
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index fc1267b8c892..9a155396d6ac 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -500,14 +500,14 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
500 | 500 | ||
501 | /* New design (By Emard) | 501 | /* New design (By Emard) |
502 | ** this rps1 code will copy internal HS event to GPIO3 pin. | 502 | ** this rps1 code will copy internal HS event to GPIO3 pin. |
503 | ** GPIO3 is in budget-patch hardware connectd to port B VSYNC | 503 | ** GPIO3 is in budget-patch hardware connected to port B VSYNC |
504 | 504 | ||
505 | ** HS is an internal event of 7146, accessible with RPS | 505 | ** HS is an internal event of 7146, accessible with RPS |
506 | ** and temporarily raised high every n lines | 506 | ** and temporarily raised high every n lines |
507 | ** (n in defined in the RPS_THRESH1 counter threshold) | 507 | ** (n in defined in the RPS_THRESH1 counter threshold) |
508 | ** I think HS is raised high on the beginning of the n-th line | 508 | ** I think HS is raised high on the beginning of the n-th line |
509 | ** and remains high until this n-th line that triggered | 509 | ** and remains high until this n-th line that triggered |
510 | ** it is completely received. When the receiption of n-th line | 510 | ** it is completely received. When the reception of n-th line |
511 | ** ends, HS is lowered. | 511 | ** ends, HS is lowered. |
512 | 512 | ||
513 | ** To transmit data over DMA, 7146 needs changing state at | 513 | ** To transmit data over DMA, 7146 needs changing state at |
@@ -541,7 +541,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
541 | ** hardware debug note: a working budget card (including budget patch) | 541 | ** hardware debug note: a working budget card (including budget patch) |
542 | ** with vpeirq() interrupt setup in mode "0x90" (every 64K) will | 542 | ** with vpeirq() interrupt setup in mode "0x90" (every 64K) will |
543 | ** generate 3 interrupts per 25-Hz DMA frame of 2*188*512 bytes | 543 | ** generate 3 interrupts per 25-Hz DMA frame of 2*188*512 bytes |
544 | ** and that means 3*25=75 Hz of interrupt freqency, as seen by | 544 | ** and that means 3*25=75 Hz of interrupt frequency, as seen by |
545 | ** watch cat /proc/interrupts | 545 | ** watch cat /proc/interrupts |
546 | ** | 546 | ** |
547 | ** If this frequency is 3x lower (and data received in the DMA | 547 | ** If this frequency is 3x lower (and data received in the DMA |
@@ -550,7 +550,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
550 | ** this means VSYNC line is not connected in the hardware. | 550 | ** this means VSYNC line is not connected in the hardware. |
551 | ** (check soldering pcb and pins) | 551 | ** (check soldering pcb and pins) |
552 | ** The same behaviour of missing VSYNC can be duplicated on budget | 552 | ** The same behaviour of missing VSYNC can be duplicated on budget |
553 | ** cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. | 553 | ** cards, by setting DD1_INIT trigger mode 7 in 3rd nibble. |
554 | */ | 554 | */ |
555 | 555 | ||
556 | // Setup RPS1 "program" (p35) | 556 | // Setup RPS1 "program" (p35) |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index bf267552941f..b8fde5cf4735 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -24,7 +24,7 @@ config VIDEO_HELPER_CHIPS_AUTO | |||
24 | decode audio/video standards. This option will autoselect | 24 | decode audio/video standards. This option will autoselect |
25 | all pertinent modules to each selected video module. | 25 | all pertinent modules to each selected video module. |
26 | 26 | ||
27 | Unselect this only if you know exaclty what you are doing, since | 27 | Unselect this only if you know exactly what you are doing, since |
28 | it may break support on some boards. | 28 | it may break support on some boards. |
29 | 29 | ||
30 | In doubt, say Y. | 30 | In doubt, say Y. |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 46c114830884..e8db6e58d390 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -1095,8 +1095,7 @@ static int pwc_video_open(struct inode *inode, struct file *file) | |||
1095 | PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev); | 1095 | PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev); |
1096 | 1096 | ||
1097 | pdev = (struct pwc_device *)vdev->priv; | 1097 | pdev = (struct pwc_device *)vdev->priv; |
1098 | if (pdev == NULL) | 1098 | BUG_ON(!pdev); |
1099 | BUG(); | ||
1100 | if (pdev->vopen) { | 1099 | if (pdev->vopen) { |
1101 | PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n"); | 1100 | PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n"); |
1102 | return -EBUSY; | 1101 | return -EBUSY; |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index e5c72719debc..051b7c5b8f03 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -6185,7 +6185,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info) | |||
6185 | "Abort", /* 12h */ | 6185 | "Abort", /* 12h */ |
6186 | "IO Not Yet Executed", /* 13h */ | 6186 | "IO Not Yet Executed", /* 13h */ |
6187 | "IO Executed", /* 14h */ | 6187 | "IO Executed", /* 14h */ |
6188 | "Persistant Reservation Out Not Affiliation Owner", /* 15h */ | 6188 | "Persistent Reservation Out Not Affiliation Owner", /* 15h */ |
6189 | "Open Transmit DMA Abort", /* 16h */ | 6189 | "Open Transmit DMA Abort", /* 16h */ |
6190 | "IO Device Missing Delay Retry", /* 17h */ | 6190 | "IO Device Missing Delay Retry", /* 17h */ |
6191 | NULL, /* 18h */ | 6191 | NULL, /* 18h */ |
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 762fa2895891..d593ef342e75 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
@@ -640,8 +640,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data) | |||
640 | } | 640 | } |
641 | 641 | ||
642 | /* Max limit for DMA frame count is 0xffff */ | 642 | /* Max limit for DMA frame count is 0xffff */ |
643 | if (unlikely(count > 0xffff)) | 643 | BUG_ON(count > 0xffff); |
644 | BUG(); | ||
645 | 644 | ||
646 | OMAP_MMC_WRITE(host->base, BUF, buf); | 645 | OMAP_MMC_WRITE(host->base, BUF, buf); |
647 | omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16, | 646 | omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16, |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 24747bdc3e19..d132ed571f13 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -607,7 +607,7 @@ config MTD_BAST_MAXSIZE | |||
607 | default "4" | 607 | default "4" |
608 | 608 | ||
609 | config MTD_SHARP_SL | 609 | config MTD_SHARP_SL |
610 | bool "ROM maped on Sharp SL Series" | 610 | bool "ROM mapped on Sharp SL Series" |
611 | depends on MTD && ARCH_PXA | 611 | depends on MTD && ARCH_PXA |
612 | help | 612 | help |
613 | This enables access to the flash chip on the Sharp SL Series of PDAs. | 613 | This enables access to the flash chip on the Sharp SL Series of PDAs. |
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c index 92b5d883d7b0..65e5ee552010 100644 --- a/drivers/mtd/maps/cfi_flagadm.c +++ b/drivers/mtd/maps/cfi_flagadm.c | |||
@@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = { | |||
80 | .size = FLASH_PARTITION2_SIZE | 80 | .size = FLASH_PARTITION2_SIZE |
81 | }, | 81 | }, |
82 | { | 82 | { |
83 | .name = "Persistant storage", | 83 | .name = "Persistent storage", |
84 | .offset = FLASH_PARTITION3_ADDR, | 84 | .offset = FLASH_PARTITION3_ADDR, |
85 | .size = FLASH_PARTITION3_SIZE | 85 | .size = FLASH_PARTITION3_SIZE |
86 | } | 86 | } |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6e863aa9894c..b6c70c58ae99 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -32,7 +32,7 @@ config IFB | |||
32 | tristate "Intermediate Functional Block support" | 32 | tristate "Intermediate Functional Block support" |
33 | depends on NET_CLS_ACT | 33 | depends on NET_CLS_ACT |
34 | ---help--- | 34 | ---help--- |
35 | This is an intermidiate driver that allows sharing of | 35 | This is an intermediate driver that allows sharing of |
36 | resources. | 36 | resources. |
37 | To compile this driver as a module, choose M here: the module | 37 | To compile this driver as a module, choose M here: the module |
38 | will be called ifb. If you want to use more than one ifb | 38 | will be called ifb. If you want to use more than one ifb |
@@ -2136,7 +2136,7 @@ config SK98LIN | |||
2136 | This driver supports the original Yukon chipset. A cleaner driver is | 2136 | This driver supports the original Yukon chipset. A cleaner driver is |
2137 | also available (skge) which seems to work better than this one. | 2137 | also available (skge) which seems to work better than this one. |
2138 | 2138 | ||
2139 | This driver does not support the newer Yukon2 chipset. A seperate | 2139 | This driver does not support the newer Yukon2 chipset. A separate |
2140 | driver, sky2, is provided to support Yukon2-based adapters. | 2140 | driver, sky2, is provided to support Yukon2-based adapters. |
2141 | 2141 | ||
2142 | The following adapters are supported by this driver: | 2142 | The following adapters are supported by this driver: |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 19ab3441269c..3a8df479cbda 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1215,7 +1215,7 @@ static void e100_setup_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb | |||
1215 | * the literal in the instruction before the code is loaded, the | 1215 | * the literal in the instruction before the code is loaded, the |
1216 | * driver can change the algorithm. | 1216 | * driver can change the algorithm. |
1217 | * | 1217 | * |
1218 | * INTDELAY - This loads the dead-man timer with its inital value. | 1218 | * INTDELAY - This loads the dead-man timer with its initial value. |
1219 | * When this timer expires the interrupt is asserted, and the | 1219 | * When this timer expires the interrupt is asserted, and the |
1220 | * timer is reset each time a new packet is received. (see | 1220 | * timer is reset each time a new packet is received. (see |
1221 | * BUNDLEMAX below to set the limit on number of chained packets) | 1221 | * BUNDLEMAX below to set the limit on number of chained packets) |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 65077f39da69..796c4f7d4260 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -3868,7 +3868,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw) | |||
3868 | * | 3868 | * |
3869 | * hw - Struct containing variables accessed by shared code | 3869 | * hw - Struct containing variables accessed by shared code |
3870 | * | 3870 | * |
3871 | * Sets bit 15 of the MII Control regiser | 3871 | * Sets bit 15 of the MII Control register |
3872 | ******************************************************************************/ | 3872 | ******************************************************************************/ |
3873 | int32_t | 3873 | int32_t |
3874 | e1000_phy_reset(struct e1000_hw *hw) | 3874 | e1000_phy_reset(struct e1000_hw *hw) |
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index b79ec0d7480f..ecb61f876f27 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig | |||
@@ -61,8 +61,8 @@ config FIXED_PHY | |||
61 | depends on PHYLIB | 61 | depends on PHYLIB |
62 | ---help--- | 62 | ---help--- |
63 | Adds the driver to PHY layer to cover the boards that do not have any PHY bound, | 63 | Adds the driver to PHY layer to cover the boards that do not have any PHY bound, |
64 | but with the ability to manipulate with speed/link in software. The relavant MII | 64 | but with the ability to manipulate the speed/link in software. The relevant MII |
65 | speed/duplex parameters could be effectively handled in user-specified fuction. | 65 | speed/duplex parameters could be effectively handled in a user-specified function. |
66 | Currently tested with mpc866ads. | 66 | Currently tested with mpc866ads. |
67 | 67 | ||
68 | config FIXED_MII_10_FDX | 68 | config FIXED_MII_10_FDX |
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h index 778d9e618ebd..3fa67171e832 100644 --- a/drivers/net/sk98lin/h/skdrv2nd.h +++ b/drivers/net/sk98lin/h/skdrv2nd.h | |||
@@ -160,7 +160,7 @@ struct s_IOCTL { | |||
160 | 160 | ||
161 | /* | 161 | /* |
162 | ** Interim definition of SK_DRV_TIMER placed in this file until | 162 | ** Interim definition of SK_DRV_TIMER placed in this file until |
163 | ** common modules have boon finallized | 163 | ** common modules have been finalized |
164 | */ | 164 | */ |
165 | #define SK_DRV_TIMER 11 | 165 | #define SK_DRV_TIMER 11 |
166 | #define SK_DRV_MODERATION_TIMER 1 | 166 | #define SK_DRV_MODERATION_TIMER 1 |
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c index 07c1b4c8699d..37ce03fb8de3 100644 --- a/drivers/net/sk98lin/skdim.c +++ b/drivers/net/sk98lin/skdim.c | |||
@@ -252,7 +252,7 @@ SkDimEnableModerationIfNeeded(SK_AC *pAC) { | |||
252 | 252 | ||
253 | /******************************************************************************* | 253 | /******************************************************************************* |
254 | ** Function : SkDimDisplayModerationSettings | 254 | ** Function : SkDimDisplayModerationSettings |
255 | ** Description : Displays the current settings regaring interrupt moderation | 255 | ** Description : Displays the current settings regarding interrupt moderation |
256 | ** Programmer : Ralph Roesler | 256 | ** Programmer : Ralph Roesler |
257 | ** Last Modified: 22-mar-03 | 257 | ** Last Modified: 22-mar-03 |
258 | ** Returns : void (!) | 258 | ** Returns : void (!) |
@@ -510,7 +510,7 @@ EnableIntMod(SK_AC *pAC) { | |||
510 | 510 | ||
511 | /******************************************************************************* | 511 | /******************************************************************************* |
512 | ** Function : DisableIntMod() | 512 | ** Function : DisableIntMod() |
513 | ** Description : Disbles the interrupt moderation independent of what inter- | 513 | ** Description : Disables the interrupt moderation independent of what inter- |
514 | ** rupts are running or not | 514 | ** rupts are running or not |
515 | ** Programmer : Ralph Roesler | 515 | ** Programmer : Ralph Roesler |
516 | ** Last Modified: 23-mar-03 | 516 | ** Last Modified: 23-mar-03 |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 1f742814a01c..72120d5c2f7b 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -6920,8 +6920,8 @@ static int ipw_qos_association(struct ipw_priv *priv, | |||
6920 | } | 6920 | } |
6921 | 6921 | ||
6922 | /* | 6922 | /* |
6923 | * handling the beaconing responces. if we get different QoS setting | 6923 | * handling the beaconing responses. if we get different QoS setting |
6924 | * of the network from the the associated setting adjust the QoS | 6924 | * off the network from the associated setting, adjust the QoS |
6925 | * setting | 6925 | * setting |
6926 | */ | 6926 | */ |
6927 | static int ipw_qos_association_resp(struct ipw_priv *priv, | 6927 | static int ipw_qos_association_resp(struct ipw_priv *priv, |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 68cb3a080050..fe3f5f5365c5 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -486,7 +486,7 @@ typedef unsigned long space_t; | |||
486 | ** This bit tells U2 to do R/M/W for partial cachelines. "Streaming" | 486 | ** This bit tells U2 to do R/M/W for partial cachelines. "Streaming" |
487 | ** data can avoid this if the mapping covers full cache lines. | 487 | ** data can avoid this if the mapping covers full cache lines. |
488 | ** o STOP_MOST is needed for atomicity across cachelines. | 488 | ** o STOP_MOST is needed for atomicity across cachelines. |
489 | ** Apperently only "some EISA devices" need this. | 489 | ** Apparently only "some EISA devices" need this. |
490 | ** Using CONFIG_ISA is hack. Only the IOA with EISA under it needs | 490 | ** Using CONFIG_ISA is hack. Only the IOA with EISA under it needs |
491 | ** to use this hint iff the EISA devices needs this feature. | 491 | ** to use this hint iff the EISA devices needs this feature. |
492 | ** According to the U2 ERS, STOP_MOST enabled pages hurt performance. | 492 | ** According to the U2 ERS, STOP_MOST enabled pages hurt performance. |
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index c2949b4367e5..12bab64a62a1 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c | |||
@@ -50,12 +50,12 @@ | |||
50 | ** | 50 | ** |
51 | ** PA Firmware | 51 | ** PA Firmware |
52 | ** ----------- | 52 | ** ----------- |
53 | ** PA-RISC platforms have two fundementally different types of firmware. | 53 | ** PA-RISC platforms have two fundamentally different types of firmware. |
54 | ** For PCI devices, "Legacy" PDC initializes the "INTERRUPT_LINE" register | 54 | ** For PCI devices, "Legacy" PDC initializes the "INTERRUPT_LINE" register |
55 | ** and BARs similar to a traditional PC BIOS. | 55 | ** and BARs similar to a traditional PC BIOS. |
56 | ** The newer "PAT" firmware supports PDC calls which return tables. | 56 | ** The newer "PAT" firmware supports PDC calls which return tables. |
57 | ** PAT firmware only initializes PCI Console and Boot interface. | 57 | ** PAT firmware only initializes the PCI Console and Boot interface. |
58 | ** With these tables, the OS can progam all other PCI devices. | 58 | ** With these tables, the OS can program all other PCI devices. |
59 | ** | 59 | ** |
60 | ** One such PAT PDC call returns the "Interrupt Routing Table" (IRT). | 60 | ** One such PAT PDC call returns the "Interrupt Routing Table" (IRT). |
61 | ** The IRT maps each PCI slot's INTA-D "output" line to an I/O SAPIC | 61 | ** The IRT maps each PCI slot's INTA-D "output" line to an I/O SAPIC |
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 5f1b9f58070e..3cfb0a3575e6 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig | |||
@@ -27,14 +27,14 @@ config PCI_MULTITHREAD_PROBE | |||
27 | smaller speedup on single processor machines. | 27 | smaller speedup on single processor machines. |
28 | 28 | ||
29 | But it can also cause lots of bad things to happen. A number | 29 | But it can also cause lots of bad things to happen. A number |
30 | of PCI drivers can not properly handle running in this way, | 30 | of PCI drivers cannot properly handle running in this way, |
31 | some will just not work properly at all, while others might | 31 | some will just not work properly at all, while others might |
32 | decide to blow up power supplies with a huge load all at once, | 32 | decide to blow up power supplies with a huge load all at once, |
33 | so use this option at your own risk. | 33 | so use this option at your own risk. |
34 | 34 | ||
35 | It is very unwise to use this option if you are not using a | 35 | It is very unwise to use this option if you are not using a |
36 | boot process that can handle devices being created in any | 36 | boot process that can handle devices being created in any |
37 | order. A program that can create persistant block and network | 37 | order. A program that can create persistent block and network |
38 | device names (like udev) is a good idea if you wish to use | 38 | device names (like udev) is a good idea if you wish to use |
39 | this option. | 39 | this option. |
40 | 40 | ||
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c index c3ac98a0a6a6..f55ac3885cb3 100644 --- a/drivers/pci/hotplug/ibmphp_hpc.c +++ b/drivers/pci/hotplug/ibmphp_hpc.c | |||
@@ -531,7 +531,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index) | |||
531 | * | 531 | * |
532 | * Action: issue a READ command to HPC | 532 | * Action: issue a READ command to HPC |
533 | * | 533 | * |
534 | * Input: pslot - can not be NULL for READ_ALLSTAT | 534 | * Input: pslot - cannot be NULL for READ_ALLSTAT |
535 | * pstatus - can be NULL for READ_ALLSTAT | 535 | * pstatus - can be NULL for READ_ALLSTAT |
536 | * | 536 | * |
537 | * Return 0 or error codes | 537 | * Return 0 or error codes |
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h index 969be465309c..1ee9a6f06541 100644 --- a/drivers/s390/net/claw.h +++ b/drivers/s390/net/claw.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #define CLAW_COMPLETE 0xff /* flag to indicate i/o completed */ | 29 | #define CLAW_COMPLETE 0xff /* flag to indicate i/o completed */ |
30 | 30 | ||
31 | /*-----------------------------------------------------* | 31 | /*-----------------------------------------------------* |
32 | * CLAW control comand code * | 32 | * CLAW control command code * |
33 | *------------------------------------------------------*/ | 33 | *------------------------------------------------------*/ |
34 | 34 | ||
35 | #define SYSTEM_VALIDATE_REQUEST 0x01 /* System Validate request */ | 35 | #define SYSTEM_VALIDATE_REQUEST 0x01 /* System Validate request */ |
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index b79f45f3ad47..a11f4e6d8bd9 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
@@ -2000,7 +2000,7 @@ | |||
2000 | * The host accesses this scratch in a different manner from the | 2000 | * The host accesses this scratch in a different manner from the |
2001 | * central sequencer. The sequencer has to use CSEQ registers CSCRPAGE | 2001 | * central sequencer. The sequencer has to use CSEQ registers CSCRPAGE |
2002 | * and CMnSCRPAGE to access the scratch memory. A flat mapping of the | 2002 | * and CMnSCRPAGE to access the scratch memory. A flat mapping of the |
2003 | * scratch memory is avaliable for software convenience and to prevent | 2003 | * scratch memory is available for software convenience and to prevent |
2004 | * corruption while the sequencer is running. This memory is mapped | 2004 | * corruption while the sequencer is running. This memory is mapped |
2005 | * onto addresses 800h - BFFh, total of 400h bytes. | 2005 | * onto addresses 800h - BFFh, total of 400h bytes. |
2006 | * | 2006 | * |
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index de7c04d4254d..e5a0ec37e954 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c | |||
@@ -64,7 +64,7 @@ struct asd_ocm_dir { | |||
64 | 64 | ||
65 | #define OCM_INIT_DIR_ENTRIES 5 | 65 | #define OCM_INIT_DIR_ENTRIES 5 |
66 | /*************************************************************************** | 66 | /*************************************************************************** |
67 | * OCM dircetory default | 67 | * OCM directory default |
68 | ***************************************************************************/ | 68 | ***************************************************************************/ |
69 | static struct asd_ocm_dir OCMDirInit = | 69 | static struct asd_ocm_dir OCMDirInit = |
70 | { | 70 | { |
@@ -73,7 +73,7 @@ static struct asd_ocm_dir OCMDirInit = | |||
73 | }; | 73 | }; |
74 | 74 | ||
75 | /*************************************************************************** | 75 | /*************************************************************************** |
76 | * OCM dircetory Entries default | 76 | * OCM directory Entries default |
77 | ***************************************************************************/ | 77 | ***************************************************************************/ |
78 | static struct asd_ocm_dir_ent OCMDirEntriesInit[OCM_INIT_DIR_ENTRIES] = | 78 | static struct asd_ocm_dir_ent OCMDirEntriesInit[OCM_INIT_DIR_ENTRIES] = |
79 | { | 79 | { |
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 6cc2bc2f62be..adb8eb4f5fd1 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
@@ -185,7 +185,7 @@ static inline struct list_head *ncr_list_pop(struct list_head *head) | |||
185 | ** power of 2 cache line size. | 185 | ** power of 2 cache line size. |
186 | ** Enhanced in linux-2.3.44 to provide a memory pool | 186 | ** Enhanced in linux-2.3.44 to provide a memory pool |
187 | ** per pcidev to support dynamic dma mapping. (I would | 187 | ** per pcidev to support dynamic dma mapping. (I would |
188 | ** have preferred a real bus astraction, btw). | 188 | ** have preferred a real bus abstraction, btw). |
189 | ** | 189 | ** |
190 | **========================================================== | 190 | **========================================================== |
191 | */ | 191 | */ |
@@ -1438,7 +1438,7 @@ struct head { | |||
1438 | ** The first four bytes (scr_st[4]) are used inside the script by | 1438 | ** The first four bytes (scr_st[4]) are used inside the script by |
1439 | ** "COPY" commands. | 1439 | ** "COPY" commands. |
1440 | ** Because source and destination must have the same alignment | 1440 | ** Because source and destination must have the same alignment |
1441 | ** in a DWORD, the fields HAVE to be at the choosen offsets. | 1441 | ** in a DWORD, the fields HAVE to be at the chosen offsets. |
1442 | ** xerr_st 0 (0x34) scratcha | 1442 | ** xerr_st 0 (0x34) scratcha |
1443 | ** sync_st 1 (0x05) sxfer | 1443 | ** sync_st 1 (0x05) sxfer |
1444 | ** wide_st 3 (0x03) scntl3 | 1444 | ** wide_st 3 (0x03) scntl3 |
@@ -1498,7 +1498,7 @@ struct head { | |||
1498 | ** the DSA (data structure address) register points | 1498 | ** the DSA (data structure address) register points |
1499 | ** to this substructure of the ccb. | 1499 | ** to this substructure of the ccb. |
1500 | ** This substructure contains the header with | 1500 | ** This substructure contains the header with |
1501 | ** the script-processor-changable data and | 1501 | ** the script-processor-changeable data and |
1502 | ** data blocks for the indirect move commands. | 1502 | ** data blocks for the indirect move commands. |
1503 | ** | 1503 | ** |
1504 | **---------------------------------------------------------- | 1504 | **---------------------------------------------------------- |
@@ -5107,7 +5107,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp) | |||
5107 | 5107 | ||
5108 | /* | 5108 | /* |
5109 | ** This CCB has been skipped by the NCR. | 5109 | ** This CCB has been skipped by the NCR. |
5110 | ** Queue it in the correponding unit queue. | 5110 | ** Queue it in the corresponding unit queue. |
5111 | */ | 5111 | */ |
5112 | static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp) | 5112 | static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp) |
5113 | { | 5113 | { |
@@ -5896,8 +5896,8 @@ static void ncr_log_hard_error(struct ncb *np, u16 sist, u_char dstat) | |||
5896 | ** | 5896 | ** |
5897 | ** In normal cases, interrupt conditions occur one at a | 5897 | ** In normal cases, interrupt conditions occur one at a |
5898 | ** time. The ncr is able to stack in some extra registers | 5898 | ** time. The ncr is able to stack in some extra registers |
5899 | ** other interrupts that will occurs after the first one. | 5899 | ** other interrupts that will occur after the first one. |
5900 | ** But severall interrupts may occur at the same time. | 5900 | ** But, several interrupts may occur at the same time. |
5901 | ** | 5901 | ** |
5902 | ** We probably should only try to deal with the normal | 5902 | ** We probably should only try to deal with the normal |
5903 | ** case, but it seems that multiple interrupts occur in | 5903 | ** case, but it seems that multiple interrupts occur in |
@@ -6796,7 +6796,7 @@ void ncr_int_sir (struct ncb *np) | |||
6796 | ** The host status field is set to HS_NEGOTIATE to mark this | 6796 | ** The host status field is set to HS_NEGOTIATE to mark this |
6797 | ** situation. | 6797 | ** situation. |
6798 | ** | 6798 | ** |
6799 | ** If the target doesn't answer this message immidiately | 6799 | ** If the target doesn't answer this message immediately |
6800 | ** (as required by the standard), the SIR_NEGO_FAIL interrupt | 6800 | ** (as required by the standard), the SIR_NEGO_FAIL interrupt |
6801 | ** will be raised eventually. | 6801 | ** will be raised eventually. |
6802 | ** The handler removes the HS_NEGOTIATE status, and sets the | 6802 | ** The handler removes the HS_NEGOTIATE status, and sets the |
diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h index cb8b7701431e..b39357d9af8d 100644 --- a/drivers/scsi/ncr53c8xx.h +++ b/drivers/scsi/ncr53c8xx.h | |||
@@ -218,7 +218,7 @@ | |||
218 | ** Same as option 1, but also deal with | 218 | ** Same as option 1, but also deal with |
219 | ** misconfigured interrupts. | 219 | ** misconfigured interrupts. |
220 | ** | 220 | ** |
221 | ** - Edge triggerred instead of level sensitive. | 221 | ** - Edge triggered instead of level sensitive. |
222 | ** - No interrupt line connected. | 222 | ** - No interrupt line connected. |
223 | ** - IRQ number misconfigured. | 223 | ** - IRQ number misconfigured. |
224 | ** | 224 | ** |
@@ -549,7 +549,7 @@ struct ncr_driver_setup { | |||
549 | 549 | ||
550 | /* | 550 | /* |
551 | ** Initial setup. | 551 | ** Initial setup. |
552 | ** Can be overriden at startup by a command line. | 552 | ** Can be overridden at startup by a command line. |
553 | */ | 553 | */ |
554 | #define SCSI_NCR_DRIVER_SETUP \ | 554 | #define SCSI_NCR_DRIVER_SETUP \ |
555 | { \ | 555 | { \ |
@@ -1093,7 +1093,7 @@ struct scr_tblsel { | |||
1093 | **----------------------------------------------------------- | 1093 | **----------------------------------------------------------- |
1094 | ** On 810A, 860, 825A, 875, 895 and 896 chips the content | 1094 | ** On 810A, 860, 825A, 875, 895 and 896 chips the content |
1095 | ** of SFBR register can be used as data (SCR_SFBR_DATA). | 1095 | ** of SFBR register can be used as data (SCR_SFBR_DATA). |
1096 | ** The 896 has additionnal IO registers starting at | 1096 | ** The 896 has additional IO registers starting at |
1097 | ** offset 0x80. Bit 7 of register offset is stored in | 1097 | ** offset 0x80. Bit 7 of register offset is stored in |
1098 | ** bit 7 of the SCRIPTS instruction first DWORD. | 1098 | ** bit 7 of the SCRIPTS instruction first DWORD. |
1099 | **----------------------------------------------------------- | 1099 | **----------------------------------------------------------- |
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 23334c8bc4c7..d895a1adb428 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -16,7 +16,7 @@ config SPI | |||
16 | controller and a chipselect. Most SPI slaves don't support | 16 | controller and a chipselect. Most SPI slaves don't support |
17 | dynamic device discovery; some are even write-only or read-only. | 17 | dynamic device discovery; some are even write-only or read-only. |
18 | 18 | ||
19 | SPI is widely used by microcontollers to talk with sensors, | 19 | SPI is widely used by microcontrollers to talk with sensors, |
20 | eeprom and flash memory, codecs and various other controller | 20 | eeprom and flash memory, codecs and various other controller |
21 | chips, analog to digital (and d-to-a) converters, and more. | 21 | chips, analog to digital (and d-to-a) converters, and more. |
22 | MMC and SD cards can be accessed using SPI protocol; and for | 22 | MMC and SD cards can be accessed using SPI protocol; and for |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index cf10cbc98f80..cc60759083bf 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -153,7 +153,7 @@ config USB_U132_HCD | |||
153 | adapter will *NOT* work with PC cards that do not contain an OHCI | 153 | adapter will *NOT* work with PC cards that do not contain an OHCI |
154 | controller. | 154 | controller. |
155 | 155 | ||
156 | For those PC cards that contain multiple OHCI controllers only ther | 156 | For those PC cards that contain multiple OHCI controllers only the |
157 | first one is used. | 157 | first one is used. |
158 | 158 | ||
159 | The driver consists of two modules, the "ftdi-elan" module is a | 159 | The driver consists of two modules, the "ftdi-elan" module is a |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 32c635ecbf31..a00d1595656c 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -211,7 +211,7 @@ int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, u8 addressofs, | |||
211 | int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, u8 addressofs, | 211 | int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, u8 addressofs, |
212 | u8 width, u32 data); | 212 | u8 width, u32 data); |
213 | /* | 213 | /* |
214 | * these can not be inlines because we need the structure offset!! | 214 | * these cannot be inlines because we need the structure offset!! |
215 | * Does anyone have a better way????? | 215 | * Does anyone have a better way????? |
216 | */ | 216 | */ |
217 | #define u132_read_pcimem(u132, member, data) \ | 217 | #define u132_read_pcimem(u132, member, data) \ |
@@ -3045,7 +3045,7 @@ static struct hc_driver u132_hc_driver = { | |||
3045 | * This function may be called by the USB core whilst the "usb_all_devices_rwsem" | 3045 | * This function may be called by the USB core whilst the "usb_all_devices_rwsem" |
3046 | * is held for writing, thus this module must not call usb_remove_hcd() | 3046 | * is held for writing, thus this module must not call usb_remove_hcd() |
3047 | * synchronously - but instead should immediately stop activity to the | 3047 | * synchronously - but instead should immediately stop activity to the |
3048 | * device and ansynchronously call usb_remove_hcd() | 3048 | * device and asynchronously call usb_remove_hcd() |
3049 | */ | 3049 | */ |
3050 | static int __devexit u132_remove(struct platform_device *pdev) | 3050 | static int __devexit u132_remove(struct platform_device *pdev) |
3051 | { | 3051 | { |
@@ -3241,7 +3241,7 @@ static int u132_resume(struct platform_device *pdev) | |||
3241 | #define u132_resume NULL | 3241 | #define u132_resume NULL |
3242 | #endif | 3242 | #endif |
3243 | /* | 3243 | /* |
3244 | * this driver is loaded explicitely by ftdi_u132 | 3244 | * this driver is loaded explicitly by ftdi_u132 |
3245 | * | 3245 | * |
3246 | * the platform_driver struct is static because it is per type of module | 3246 | * the platform_driver struct is static because it is per type of module |
3247 | */ | 3247 | */ |
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h index 551ba8906d62..5b5a3e621daa 100644 --- a/drivers/usb/misc/usb_u132.h +++ b/drivers/usb/misc/usb_u132.h | |||
@@ -52,7 +52,7 @@ | |||
52 | * the kernel to load the "u132-hcd" module. | 52 | * the kernel to load the "u132-hcd" module. |
53 | * | 53 | * |
54 | * The "ftdi-u132" module provides the interface to the inserted | 54 | * The "ftdi-u132" module provides the interface to the inserted |
55 | * PC card and the "u132-hcd" module uses the API to send and recieve | 55 | * PC card and the "u132-hcd" module uses the API to send and receive |
56 | * data. The API features call-backs, so that part of the "u132-hcd" | 56 | * data. The API features call-backs, so that part of the "u132-hcd" |
57 | * module code will run in the context of one of the kernel threads | 57 | * module code will run in the context of one of the kernel threads |
58 | * of the "ftdi-u132" module. | 58 | * of the "ftdi-u132" module. |
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index bdb58100fc1d..5e3ac281a2f8 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
@@ -157,7 +157,7 @@ | |||
157 | * to TASK_RUNNING will be lost and write_chan's subsequent call to | 157 | * to TASK_RUNNING will be lost and write_chan's subsequent call to |
158 | * schedule() will never return (unless it catches a signal). | 158 | * schedule() will never return (unless it catches a signal). |
159 | * This race condition occurs because write_bulk_callback() (and thus | 159 | * This race condition occurs because write_bulk_callback() (and thus |
160 | * the wakeup) are called asynchonously from an interrupt, rather than | 160 | * the wakeup) are called asynchronously from an interrupt, rather than |
161 | * from the scheduler. We can avoid the race by calling the wakeup | 161 | * from the scheduler. We can avoid the race by calling the wakeup |
162 | * from the scheduler queue and that's our fix: Now, at the end of | 162 | * from the scheduler queue and that's our fix: Now, at the end of |
163 | * write_bulk_callback() we queue up a wakeup call on the scheduler | 163 | * write_bulk_callback() we queue up a wakeup call on the scheduler |
diff --git a/fs/Kconfig b/fs/Kconfig index 7b1511d50b05..b3b5aa0edff9 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -972,7 +972,7 @@ config SYSFS | |||
972 | 972 | ||
973 | Some system agents rely on the information in sysfs to operate. | 973 | Some system agents rely on the information in sysfs to operate. |
974 | /sbin/hotplug uses device and object attributes in sysfs to assist in | 974 | /sbin/hotplug uses device and object attributes in sysfs to assist in |
975 | delegating policy decisions, like persistantly naming devices. | 975 | delegating policy decisions, like persistently naming devices. |
976 | 976 | ||
977 | sysfs is currently used by the block subsystem to mount the root | 977 | sysfs is currently used by the block subsystem to mount the root |
978 | partition. If sysfs is disabled you must specify the boot device on | 978 | partition. If sysfs is disabled you must specify the boot device on |
@@ -1145,7 +1145,7 @@ config BEFS_FS | |||
1145 | help | 1145 | help |
1146 | The BeOS File System (BeFS) is the native file system of Be, Inc's | 1146 | The BeOS File System (BeFS) is the native file system of Be, Inc's |
1147 | BeOS. Notable features include support for arbitrary attributes | 1147 | BeOS. Notable features include support for arbitrary attributes |
1148 | on files and directories, and database-like indeces on selected | 1148 | on files and directories, and database-like indices on selected |
1149 | attributes. (Also note that this driver doesn't make those features | 1149 | attributes. (Also note that this driver doesn't make those features |
1150 | available at this time). It is a 64 bit filesystem, so it supports | 1150 | available at this time). It is a 64 bit filesystem, so it supports |
1151 | extremely large volumes and files. | 1151 | extremely large volumes and files. |
@@ -367,8 +367,7 @@ void fastcall __put_ioctx(struct kioctx *ctx) | |||
367 | { | 367 | { |
368 | unsigned nr_events = ctx->max_reqs; | 368 | unsigned nr_events = ctx->max_reqs; |
369 | 369 | ||
370 | if (unlikely(ctx->reqs_active)) | 370 | BUG_ON(ctx->reqs_active); |
371 | BUG(); | ||
372 | 371 | ||
373 | cancel_delayed_work(&ctx->wq); | 372 | cancel_delayed_work(&ctx->wq); |
374 | flush_workqueue(aio_wq); | 373 | flush_workqueue(aio_wq); |
@@ -505,8 +504,7 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req) | |||
505 | assert_spin_locked(&ctx->ctx_lock); | 504 | assert_spin_locked(&ctx->ctx_lock); |
506 | 505 | ||
507 | req->ki_users --; | 506 | req->ki_users --; |
508 | if (unlikely(req->ki_users < 0)) | 507 | BUG_ON(req->ki_users < 0); |
509 | BUG(); | ||
510 | if (likely(req->ki_users)) | 508 | if (likely(req->ki_users)) |
511 | return 0; | 509 | return 0; |
512 | list_del(&req->ki_list); /* remove from active_reqs */ | 510 | list_del(&req->ki_list); /* remove from active_reqs */ |
diff --git a/fs/jfs/jfs_filsys.h b/fs/jfs/jfs_filsys.h index 9901928668cf..eb550b339bb8 100644 --- a/fs/jfs/jfs_filsys.h +++ b/fs/jfs/jfs_filsys.h | |||
@@ -81,7 +81,7 @@ | |||
81 | #define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */ | 81 | #define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */ |
82 | 82 | ||
83 | /* Directory index */ | 83 | /* Directory index */ |
84 | #define JFS_DIR_INDEX 0x00200000 /* Persistant index for */ | 84 | #define JFS_DIR_INDEX 0x00200000 /* Persistent index for */ |
85 | /* directory entries */ | 85 | /* directory entries */ |
86 | 86 | ||
87 | 87 | ||
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 85ce23268302..ac93174c9639 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1464,7 +1464,7 @@ static int flush_journal_list(struct super_block *s, | |||
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | /* if someone has this block in a newer transaction, just make | 1466 | /* if someone has this block in a newer transaction, just make |
1467 | ** sure they are commited, and don't try writing it to disk | 1467 | ** sure they are committed, and don't try writing it to disk |
1468 | */ | 1468 | */ |
1469 | if (pjl) { | 1469 | if (pjl) { |
1470 | if (atomic_read(&pjl->j_commit_left)) | 1470 | if (atomic_read(&pjl->j_commit_left)) |
@@ -3384,7 +3384,7 @@ static int remove_from_transaction(struct super_block *p_s_sb, | |||
3384 | 3384 | ||
3385 | /* | 3385 | /* |
3386 | ** for any cnode in a journal list, it can only be dirtied of all the | 3386 | ** for any cnode in a journal list, it can only be dirtied of all the |
3387 | ** transactions that include it are commited to disk. | 3387 | ** transactions that include it are committed to disk. |
3388 | ** this checks through each transaction, and returns 1 if you are allowed to dirty, | 3388 | ** this checks through each transaction, and returns 1 if you are allowed to dirty, |
3389 | ** and 0 if you aren't | 3389 | ** and 0 if you aren't |
3390 | ** | 3390 | ** |
@@ -3426,7 +3426,7 @@ static int can_dirty(struct reiserfs_journal_cnode *cn) | |||
3426 | } | 3426 | } |
3427 | 3427 | ||
3428 | /* syncs the commit blocks, but does not force the real buffers to disk | 3428 | /* syncs the commit blocks, but does not force the real buffers to disk |
3429 | ** will wait until the current transaction is done/commited before returning | 3429 | ** will wait until the current transaction is done/committed before returning |
3430 | */ | 3430 | */ |
3431 | int journal_end_sync(struct reiserfs_transaction_handle *th, | 3431 | int journal_end_sync(struct reiserfs_transaction_handle *th, |
3432 | struct super_block *p_s_sb, unsigned long nblocks) | 3432 | struct super_block *p_s_sb, unsigned long nblocks) |
diff --git a/include/asm-m68knommu/mcfmbus.h b/include/asm-m68knommu/mcfmbus.h index 13df9d41bd1a..319899c47a2c 100644 --- a/include/asm-m68knommu/mcfmbus.h +++ b/include/asm-m68knommu/mcfmbus.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #define MCFMBUS_MFDR_MBC(a) ((a)&0x3F) /*M-Bus Clock*/ | 37 | #define MCFMBUS_MFDR_MBC(a) ((a)&0x3F) /*M-Bus Clock*/ |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Define bit flags in Controll Register | 40 | * Define bit flags in Control Register |
41 | */ | 41 | */ |
42 | 42 | ||
43 | #define MCFMBUS_MBCR_MEN (0x80) /* M-Bus Enable */ | 43 | #define MCFMBUS_MBCR_MEN (0x80) /* M-Bus Enable */ |
diff --git a/include/asm-parisc/dma.h b/include/asm-parisc/dma.h index da2cf373e31c..31ad0f05af3d 100644 --- a/include/asm-parisc/dma.h +++ b/include/asm-parisc/dma.h | |||
@@ -17,10 +17,10 @@ | |||
17 | 17 | ||
18 | /* | 18 | /* |
19 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up | 19 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up |
20 | ** (or rather not merge) DMA's into managable chunks. | 20 | ** (or rather not merge) DMAs into manageable chunks. |
21 | ** On parisc, this is more of the software/tuning constraint | 21 | ** On parisc, this is more of the software/tuning constraint |
22 | ** rather than the HW. I/O MMU allocation alogorithms can be | 22 | ** rather than the HW. I/O MMU allocation algorithms can be |
23 | ** faster with smaller size is (to some degree). | 23 | ** faster with smaller sizes (to some degree). |
24 | */ | 24 | */ |
25 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*PAGE_SIZE) | 25 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*PAGE_SIZE) |
26 | 26 | ||
diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h index 7b8ad118d2fe..7b3be9ac0dda 100644 --- a/include/asm-parisc/pci.h +++ b/include/asm-parisc/pci.h | |||
@@ -149,7 +149,7 @@ extern int parisc_bus_is_phys; /* in arch/parisc/kernel/setup.c */ | |||
149 | /* | 149 | /* |
150 | ** Most PCI devices (eg Tulip, NCR720) also export the same registers | 150 | ** Most PCI devices (eg Tulip, NCR720) also export the same registers |
151 | ** to both MMIO and I/O port space. Due to poor performance of I/O Port | 151 | ** to both MMIO and I/O port space. Due to poor performance of I/O Port |
152 | ** access under HP PCI bus adapters, strongly reccomend use of MMIO | 152 | ** access under HP PCI bus adapters, strongly recommend the use of MMIO |
153 | ** address space. | 153 | ** address space. |
154 | ** | 154 | ** |
155 | ** While I'm at it more PA programming notes: | 155 | ** While I'm at it more PA programming notes: |
diff --git a/include/asm-parisc/ropes.h b/include/asm-parisc/ropes.h index 5542dd00472b..007a880615eb 100644 --- a/include/asm-parisc/ropes.h +++ b/include/asm-parisc/ropes.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #endif | 14 | #endif |
15 | 15 | ||
16 | /* | 16 | /* |
17 | ** The number of pdir entries to "free" before issueing | 17 | ** The number of pdir entries to "free" before issuing |
18 | ** a read to PCOM register to flush out PCOM writes. | 18 | ** a read to PCOM register to flush out PCOM writes. |
19 | ** Interacts with allocation granularity (ie 4 or 8 entries | 19 | ** Interacts with allocation granularity (ie 4 or 8 entries |
20 | ** allocated and free'd/purged at a time might make this | 20 | ** allocated and free'd/purged at a time might make this |
diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h index fd1756d3a47e..88b45895746d 100644 --- a/include/linux/ixjuser.h +++ b/include/linux/ixjuser.h | |||
@@ -315,7 +315,7 @@ typedef struct { | |||
315 | * structures. If the freq0 variable is non-zero, the tone table contents | 315 | * structures. If the freq0 variable is non-zero, the tone table contents |
316 | * for the tone_index are updated to the frequencies and gains defined. It | 316 | * for the tone_index are updated to the frequencies and gains defined. It |
317 | * should be noted that DTMF tones cannot be reassigned, so if DTMF tone | 317 | * should be noted that DTMF tones cannot be reassigned, so if DTMF tone |
318 | * table indexs are used in a cadence the frequency and gain variables will | 318 | * table indexes are used in a cadence the frequency and gain variables will |
319 | * be ignored. | 319 | * be ignored. |
320 | * | 320 | * |
321 | * If the array elements contain frequency parameters the driver will | 321 | * If the array elements contain frequency parameters the driver will |
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index c8d5f207c3d4..0ec6e28bccd2 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
@@ -74,7 +74,7 @@ | |||
74 | #define __jiffy_data __attribute__((section(".data"))) | 74 | #define __jiffy_data __attribute__((section(".data"))) |
75 | 75 | ||
76 | /* | 76 | /* |
77 | * The 64-bit value is not volatile - you MUST NOT read it | 77 | * The 64-bit value is not atomic - you MUST NOT read it |
78 | * without sampling the sequence number in xtime_lock. | 78 | * without sampling the sequence number in xtime_lock. |
79 | * get_jiffies_64() will do this for you as appropriate. | 79 | * get_jiffies_64() will do this for you as appropriate. |
80 | */ | 80 | */ |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index b9b5e4ba166a..6738283ac385 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -65,7 +65,7 @@ struct user; | |||
65 | * context (spinlock, irq-handler, ...). | 65 | * context (spinlock, irq-handler, ...). |
66 | * | 66 | * |
67 | * This is a useful debugging help to be able to catch problems early and not | 67 | * This is a useful debugging help to be able to catch problems early and not |
68 | * be biten later when the calling function happens to sleep when it is not | 68 | * be bitten later when the calling function happens to sleep when it is not |
69 | * supposed to. | 69 | * supposed to. |
70 | */ | 70 | */ |
71 | #ifdef CONFIG_PREEMPT_VOLUNTARY | 71 | #ifdef CONFIG_PREEMPT_VOLUNTARY |
diff --git a/include/linux/mqueue.h b/include/linux/mqueue.h index 8db9d75541a6..8b5a79615fbf 100644 --- a/include/linux/mqueue.h +++ b/include/linux/mqueue.h | |||
@@ -18,8 +18,6 @@ | |||
18 | #ifndef _LINUX_MQUEUE_H | 18 | #ifndef _LINUX_MQUEUE_H |
19 | #define _LINUX_MQUEUE_H | 19 | #define _LINUX_MQUEUE_H |
20 | 20 | ||
21 | #include <linux/types.h> | ||
22 | |||
23 | #define MQ_PRIO_MAX 32768 | 21 | #define MQ_PRIO_MAX 32768 |
24 | /* per-uid limit of kernel memory used by mqueue, in bytes */ | 22 | /* per-uid limit of kernel memory used by mqueue, in bytes */ |
25 | #define MQ_BYTES_MAX 819200 | 23 | #define MQ_BYTES_MAX 819200 |
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 73e0becec086..62a7169aed8b 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h | |||
@@ -429,7 +429,7 @@ enum reiserfs_mount_options { | |||
429 | /* -o hash={tea, rupasov, r5, detect} is meant for properly mounting | 429 | /* -o hash={tea, rupasov, r5, detect} is meant for properly mounting |
430 | ** reiserfs disks from 3.5.19 or earlier. 99% of the time, this option | 430 | ** reiserfs disks from 3.5.19 or earlier. 99% of the time, this option |
431 | ** is not required. If the normal autodection code can't determine which | 431 | ** is not required. If the normal autodection code can't determine which |
432 | ** hash to use (because both hases had the same value for a file) | 432 | ** hash to use (because both hashes had the same value for a file) |
433 | ** use this option to force a specific hash. It won't allow you to override | 433 | ** use this option to force a specific hash. It won't allow you to override |
434 | ** the existing hash on the FS, so if you have a tea hash disk, and mount | 434 | ** the existing hash on the FS, so if you have a tea hash disk, and mount |
435 | ** with -o hash=rupasov, the mount will fail. | 435 | ** with -o hash=rupasov, the mount will fail. |
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h index 7dac8f04d28e..004808a6df1d 100644 --- a/include/linux/textsearch.h +++ b/include/linux/textsearch.h | |||
@@ -20,7 +20,7 @@ struct ts_config; | |||
20 | /** | 20 | /** |
21 | * struct ts_state - search state | 21 | * struct ts_state - search state |
22 | * @offset: offset for next match | 22 | * @offset: offset for next match |
23 | * @cb: control buffer, for persistant variables of get_next_block() | 23 | * @cb: control buffer, for persistent variables of get_next_block() |
24 | */ | 24 | */ |
25 | struct ts_state | 25 | struct ts_state |
26 | { | 26 | { |
@@ -71,7 +71,7 @@ struct ts_config | |||
71 | * Called repeatedly until 0 is returned. Must assign the | 71 | * Called repeatedly until 0 is returned. Must assign the |
72 | * head of the next block of data to &*dst and return the length | 72 | * head of the next block of data to &*dst and return the length |
73 | * of the block or 0 if at the end. consumed == 0 indicates | 73 | * of the block or 0 if at the end. consumed == 0 indicates |
74 | * a new search. May store/read persistant values in state->cb. | 74 | * a new search. May store/read persistent values in state->cb. |
75 | */ | 75 | */ |
76 | unsigned int (*get_next_block)(unsigned int consumed, | 76 | unsigned int (*get_next_block)(unsigned int consumed, |
77 | const u8 **dst, | 77 | const u8 **dst, |
diff --git a/lib/textsearch.c b/lib/textsearch.c index 2cb4a437942e..98bcadc01185 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * configuration according to the specified parameters. | 40 | * configuration according to the specified parameters. |
41 | * (3) User starts the search(es) by calling _find() or _next() to | 41 | * (3) User starts the search(es) by calling _find() or _next() to |
42 | * fetch subsequent occurrences. A state variable is provided | 42 | * fetch subsequent occurrences. A state variable is provided |
43 | * to the algorihtm to store persistant variables. | 43 | * to the algorihtm to store persistent variables. |
44 | * (4) Core eventually resets the search offset and forwards the find() | 44 | * (4) Core eventually resets the search offset and forwards the find() |
45 | * request to the algorithm. | 45 | * request to the algorithm. |
46 | * (5) Algorithm calls get_next_block() provided by the user continously | 46 | * (5) Algorithm calls get_next_block() provided by the user continously |
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index 6f39faa15832..c2059733e15a 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Due Credit: | 13 | * Due Credit: |
14 | * Wanpipe socket layer is based on Packet and | 14 | * Wanpipe socket layer is based on Packet and |
15 | * the X25 socket layers. The above sockets were | 15 | * the X25 socket layers. The above sockets were |
16 | * used for the specific use of Sangoma Technoloiges | 16 | * used for the specific use of Sangoma Technologies |
17 | * API programs. | 17 | * API programs. |
18 | * Packet socket Authors: Ross Biro, Fred N. van Kempen and | 18 | * Packet socket Authors: Ross Biro, Fred N. van Kempen and |
19 | * Alan Cox. | 19 | * Alan Cox. |
@@ -23,7 +23,7 @@ | |||
23 | * Apr 25, 2000 Nenad Corbic o Added the ability to send zero length packets. | 23 | * Apr 25, 2000 Nenad Corbic o Added the ability to send zero length packets. |
24 | * Mar 13, 2000 Nenad Corbic o Added a tx buffer check via ioctl call. | 24 | * Mar 13, 2000 Nenad Corbic o Added a tx buffer check via ioctl call. |
25 | * Mar 06, 2000 Nenad Corbic o Fixed the corrupt sock lcn problem. | 25 | * Mar 06, 2000 Nenad Corbic o Fixed the corrupt sock lcn problem. |
26 | * Server and client applicaton can run | 26 | * Server and client application can run |
27 | * simultaneously without conflicts. | 27 | * simultaneously without conflicts. |
28 | * Feb 29, 2000 Nenad Corbic o Added support for PVC protocols, such as | 28 | * Feb 29, 2000 Nenad Corbic o Added support for PVC protocols, such as |
29 | * CHDLC, Frame Relay and HDLC API. | 29 | * CHDLC, Frame Relay and HDLC API. |
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 9479659277ae..316211d9f17d 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * This module is completely hardware-independent and provides | 4 | * This module is completely hardware-independent and provides |
5 | * the following common services for the WAN Link Drivers: | 5 | * the following common services for the WAN Link Drivers: |
6 | * o WAN device managenment (registering, unregistering) | 6 | * o WAN device management (registering, unregistering) |
7 | * o Network interface management | 7 | * o Network interface management |
8 | * o Physical connection management (dial-up, incoming calls) | 8 | * o Physical connection management (dial-up, incoming calls) |
9 | * o Logical connection management (switched virtual circuits) | 9 | * o Logical connection management (switched virtual circuits) |
diff --git a/sound/Kconfig b/sound/Kconfig index e0d791a98452..95949b6806ac 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
@@ -64,11 +64,11 @@ source "sound/arm/Kconfig" | |||
64 | 64 | ||
65 | source "sound/mips/Kconfig" | 65 | source "sound/mips/Kconfig" |
66 | 66 | ||
67 | # the following will depenend on the order of config. | 67 | # the following will depend on the order of config. |
68 | # here assuming USB is defined before ALSA | 68 | # here assuming USB is defined before ALSA |
69 | source "sound/usb/Kconfig" | 69 | source "sound/usb/Kconfig" |
70 | 70 | ||
71 | # the following will depenend on the order of config. | 71 | # the following will depend on the order of config. |
72 | # here assuming PCMCIA is defined before ALSA | 72 | # here assuming PCMCIA is defined before ALSA |
73 | source "sound/pcmcia/Kconfig" | 73 | source "sound/pcmcia/Kconfig" |
74 | 74 | ||
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index 6e3c41f530e6..b1c5d8286e40 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c | |||
@@ -779,7 +779,7 @@ static unsigned int cs_set_adc_rate(struct cs_state *state, unsigned int rate) | |||
779 | rate = 48000 / 9; | 779 | rate = 48000 / 9; |
780 | 780 | ||
781 | /* | 781 | /* |
782 | * We can not capture at at rate greater than the Input Rate (48000). | 782 | * We cannot capture at at rate greater than the Input Rate (48000). |
783 | * Return an error if an attempt is made to stray outside that limit. | 783 | * Return an error if an attempt is made to stray outside that limit. |
784 | */ | 784 | */ |
785 | if (rate > 48000) | 785 | if (rate > 48000) |
@@ -4754,8 +4754,8 @@ static int cs_hardware_init(struct cs_card *card) | |||
4754 | mdelay(5 * cs_laptop_wait); /* Shouldnt be needed ?? */ | 4754 | mdelay(5 * cs_laptop_wait); /* Shouldnt be needed ?? */ |
4755 | 4755 | ||
4756 | /* | 4756 | /* |
4757 | * If we are resuming under 2.2.x then we can not schedule a timeout. | 4757 | * If we are resuming under 2.2.x then we cannot schedule a timeout, |
4758 | * so, just spin the CPU. | 4758 | * so just spin the CPU. |
4759 | */ | 4759 | */ |
4760 | if (card->pm.flags & CS46XX_PM_IDLE) { | 4760 | if (card->pm.flags & CS46XX_PM_IDLE) { |
4761 | /* | 4761 | /* |