diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d | |
parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
153 files changed, 228 insertions, 227 deletions
diff --git a/.gitignore b/.gitignore index 51bd99d6a260..caa8395f6358 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -3,7 +3,7 @@ | |||
3 | # subdirectories here. Add them in the ".gitignore" file | 3 | # subdirectories here. Add them in the ".gitignore" file |
4 | # in that subdirectory instead. | 4 | # in that subdirectory instead. |
5 | # | 5 | # |
6 | # NOTE! Please use 'git-ls-files -i --exclude-standard' | 6 | # NOTE! Please use 'git ls-files -i --exclude-standard' |
7 | # command after changing this file, to see if there are | 7 | # command after changing this file, to see if there are |
8 | # any tracked files which get ignored after the change. | 8 | # any tracked files which get ignored after the change. |
9 | # | 9 | # |
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 72968cd5eaf3..8bb37237ebd2 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
@@ -698,8 +698,8 @@ very often is not. Abundant use of the inline keyword leads to a much bigger | |||
698 | kernel, which in turn slows the system as a whole down, due to a bigger | 698 | kernel, which in turn slows the system as a whole down, due to a bigger |
699 | icache footprint for the CPU and simply because there is less memory | 699 | icache footprint for the CPU and simply because there is less memory |
700 | available for the pagecache. Just think about it; a pagecache miss causes a | 700 | available for the pagecache. Just think about it; a pagecache miss causes a |
701 | disk seek, which easily takes 5 miliseconds. There are a LOT of cpu cycles | 701 | disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles |
702 | that can go into these 5 miliseconds. | 702 | that can go into these 5 milliseconds. |
703 | 703 | ||
704 | A reasonable rule of thumb is to not put inline at functions that have more | 704 | A reasonable rule of thumb is to not put inline at functions that have more |
705 | than 3 lines of code in them. An exception to this rule are the cases where | 705 | than 3 lines of code in them. An exception to this rule are the cases where |
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 25fb8bcf32a2..5aceb88b3f8b 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
@@ -676,8 +676,8 @@ this directory the following files can currently be found: | |||
676 | dma-api/all_errors This file contains a numeric value. If this | 676 | dma-api/all_errors This file contains a numeric value. If this |
677 | value is not equal to zero the debugging code | 677 | value is not equal to zero the debugging code |
678 | will print a warning for every error it finds | 678 | will print a warning for every error it finds |
679 | into the kernel log. Be carefull with this | 679 | into the kernel log. Be careful with this |
680 | option. It can easily flood your logs. | 680 | option, as it can easily flood your logs. |
681 | 681 | ||
682 | dma-api/disabled This read-only file contains the character 'Y' | 682 | dma-api/disabled This read-only file contains the character 'Y' |
683 | if the debugging code is disabled. This can | 683 | if the debugging code is disabled. This can |
diff --git a/Documentation/RCU/rculist_nulls.txt b/Documentation/RCU/rculist_nulls.txt index 6389dec33459..93cb28d05dcd 100644 --- a/Documentation/RCU/rculist_nulls.txt +++ b/Documentation/RCU/rculist_nulls.txt | |||
@@ -118,7 +118,7 @@ to another chain) checking the final 'nulls' value if | |||
118 | the lookup met the end of chain. If final 'nulls' value | 118 | the lookup met the end of chain. If final 'nulls' value |
119 | is not the slot number, then we must restart the lookup at | 119 | is not the slot number, then we must restart the lookup at |
120 | the beginning. If the object was moved to the same chain, | 120 | the beginning. If the object was moved to the same chain, |
121 | then the reader doesnt care : It might eventually | 121 | then the reader doesn't care : It might eventually |
122 | scan the list again without harm. | 122 | scan the list again without harm. |
123 | 123 | ||
124 | 124 | ||
diff --git a/Documentation/SM501.txt b/Documentation/SM501.txt index 6fc656035925..561826f82093 100644 --- a/Documentation/SM501.txt +++ b/Documentation/SM501.txt | |||
@@ -5,7 +5,7 @@ Copyright 2006, 2007 Simtec Electronics | |||
5 | 5 | ||
6 | The Silicon Motion SM501 multimedia companion chip is a multifunction device | 6 | The Silicon Motion SM501 multimedia companion chip is a multifunction device |
7 | which may provide numerous interfaces including USB host controller USB gadget, | 7 | which may provide numerous interfaces including USB host controller USB gadget, |
8 | Asyncronous Serial ports, Audio functions and a dual display video interface. | 8 | asynchronous serial ports, audio functions, and a dual display video interface. |
9 | The device may be connected by PCI or local bus with varying functions enabled. | 9 | The device may be connected by PCI or local bus with varying functions enabled. |
10 | 10 | ||
11 | Core | 11 | Core |
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 6c456835c1fd..5c555a8b39e5 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches | |||
@@ -187,8 +187,9 @@ Even if the maintainer did not respond in step #4, make sure to ALWAYS | |||
187 | copy the maintainer when you change their code. | 187 | copy the maintainer when you change their code. |
188 | 188 | ||
189 | For small patches you may want to CC the Trivial Patch Monkey | 189 | For small patches you may want to CC the Trivial Patch Monkey |
190 | trivial@kernel.org managed by Jesper Juhl; which collects "trivial" | 190 | trivial@kernel.org which collects "trivial" patches. Have a look |
191 | patches. Trivial patches must qualify for one of the following rules: | 191 | into the MAINTAINERS file for its current manager. |
192 | Trivial patches must qualify for one of the following rules: | ||
192 | Spelling fixes in documentation | 193 | Spelling fixes in documentation |
193 | Spelling fixes which could break grep(1) | 194 | Spelling fixes which could break grep(1) |
194 | Warning fixes (cluttering with useless warnings is bad) | 195 | Warning fixes (cluttering with useless warnings is bad) |
@@ -200,7 +201,6 @@ patches. Trivial patches must qualify for one of the following rules: | |||
200 | since people copy, as long as it's trivial) | 201 | since people copy, as long as it's trivial) |
201 | Any fix by the author/maintainer of the file (ie. patch monkey | 202 | Any fix by the author/maintainer of the file (ie. patch monkey |
202 | in re-transmission mode) | 203 | in re-transmission mode) |
203 | URL: <http://www.kernel.org/pub/linux/kernel/people/juhl/trivial/> | ||
204 | 204 | ||
205 | 205 | ||
206 | 206 | ||
diff --git a/Documentation/block/deadline-iosched.txt b/Documentation/block/deadline-iosched.txt index 72576769e0f4..2d82c80322cb 100644 --- a/Documentation/block/deadline-iosched.txt +++ b/Documentation/block/deadline-iosched.txt | |||
@@ -58,7 +58,7 @@ same criteria as reads. | |||
58 | front_merges (bool) | 58 | front_merges (bool) |
59 | ------------ | 59 | ------------ |
60 | 60 | ||
61 | Sometimes it happens that a request enters the io scheduler that is contigious | 61 | Sometimes it happens that a request enters the io scheduler that is contiguous |
62 | with a request that is already on the queue. Either it fits in the back of that | 62 | with a request that is already on the queue. Either it fits in the back of that |
63 | request, or it fits at the front. That is called either a back merge candidate | 63 | request, or it fits at the front. That is called either a back merge candidate |
64 | or a front merge candidate. Due to the way files are typically laid out, | 64 | or a front merge candidate. Due to the way files are typically laid out, |
diff --git a/Documentation/braille-console.txt b/Documentation/braille-console.txt index 000b0fbdc105..d0d042c2fd5e 100644 --- a/Documentation/braille-console.txt +++ b/Documentation/braille-console.txt | |||
@@ -27,7 +27,7 @@ parameter. | |||
27 | 27 | ||
28 | For simplicity, only one braille console can be enabled, other uses of | 28 | For simplicity, only one braille console can be enabled, other uses of |
29 | console=brl,... will be discarded. Also note that it does not interfere with | 29 | console=brl,... will be discarded. Also note that it does not interfere with |
30 | the console selection mecanism described in serial-console.txt | 30 | the console selection mechanism described in serial-console.txt |
31 | 31 | ||
32 | For now, only the VisioBraille device is supported. | 32 | For now, only the VisioBraille device is supported. |
33 | 33 | ||
diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt index c11b931f8f98..15174985ad08 100644 --- a/Documentation/dell_rbu.txt +++ b/Documentation/dell_rbu.txt | |||
@@ -76,9 +76,9 @@ Do the steps below to download the BIOS image. | |||
76 | 76 | ||
77 | The /sys/class/firmware/dell_rbu/ entries will remain till the following is | 77 | The /sys/class/firmware/dell_rbu/ entries will remain till the following is |
78 | done. | 78 | done. |
79 | echo -1 > /sys/class/firmware/dell_rbu/loading. | 79 | echo -1 > /sys/class/firmware/dell_rbu/loading |
80 | Until this step is completed the driver cannot be unloaded. | 80 | Until this step is completed the driver cannot be unloaded. |
81 | Also echoing either mono ,packet or init in to image_type will free up the | 81 | Also echoing either mono, packet or init in to image_type will free up the |
82 | memory allocated by the driver. | 82 | memory allocated by the driver. |
83 | 83 | ||
84 | If a user by accident executes steps 1 and 3 above without executing step 2; | 84 | If a user by accident executes steps 1 and 3 above without executing step 2; |
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 387b8a720f4a..d79aead9418b 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt | |||
@@ -188,7 +188,7 @@ For example, you can do something like the following. | |||
188 | 188 | ||
189 | void my_midlayer_destroy_something() | 189 | void my_midlayer_destroy_something() |
190 | { | 190 | { |
191 | devres_release_group(dev, my_midlayer_create_soemthing); | 191 | devres_release_group(dev, my_midlayer_create_something); |
192 | } | 192 | } |
193 | 193 | ||
194 | 194 | ||
diff --git a/Documentation/edac.txt b/Documentation/edac.txt index 8eda3fb66416..06f8f46692dc 100644 --- a/Documentation/edac.txt +++ b/Documentation/edac.txt | |||
@@ -23,8 +23,8 @@ first time, it was renamed to 'EDAC'. | |||
23 | The bluesmoke project at sourceforge.net is now utilized as a 'staging area' | 23 | The bluesmoke project at sourceforge.net is now utilized as a 'staging area' |
24 | for EDAC development, before it is sent upstream to kernel.org | 24 | for EDAC development, before it is sent upstream to kernel.org |
25 | 25 | ||
26 | At the bluesmoke/EDAC project site, is a series of quilt patches against | 26 | At the bluesmoke/EDAC project site is a series of quilt patches against |
27 | recent kernels, stored in a SVN respository. For easier downloading, there | 27 | recent kernels, stored in a SVN repository. For easier downloading, there |
28 | is also a tarball snapshot available. | 28 | is also a tarball snapshot available. |
29 | 29 | ||
30 | ============================================================================ | 30 | ============================================================================ |
@@ -73,9 +73,9 @@ the vendor should tie the parity status bits to 0 if they do not intend | |||
73 | to generate parity. Some vendors do not do this, and thus the parity bit | 73 | to generate parity. Some vendors do not do this, and thus the parity bit |
74 | can "float" giving false positives. | 74 | can "float" giving false positives. |
75 | 75 | ||
76 | In the kernel there is a pci device attribute located in sysfs that is | 76 | In the kernel there is a PCI device attribute located in sysfs that is |
77 | checked by the EDAC PCI scanning code. If that attribute is set, | 77 | checked by the EDAC PCI scanning code. If that attribute is set, |
78 | PCI parity/error scannining is skipped for that device. The attribute | 78 | PCI parity/error scanning is skipped for that device. The attribute |
79 | is: | 79 | is: |
80 | 80 | ||
81 | broken_parity_status | 81 | broken_parity_status |
diff --git a/Documentation/fb/sh7760fb.txt b/Documentation/fb/sh7760fb.txt index c87bfe5c630a..b994c3b10549 100644 --- a/Documentation/fb/sh7760fb.txt +++ b/Documentation/fb/sh7760fb.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | SH7760/SH7763 integrated LCDC Framebuffer driver | 1 | SH7760/SH7763 integrated LCDC Framebuffer driver |
2 | ================================================ | 2 | ================================================ |
3 | 3 | ||
4 | 0. Overwiew | 4 | 0. Overview |
5 | ----------- | 5 | ----------- |
6 | The SH7760/SH7763 have an integrated LCD Display controller (LCDC) which | 6 | The SH7760/SH7763 have an integrated LCD Display controller (LCDC) which |
7 | supports (in theory) resolutions ranging from 1x1 to 1024x1024, | 7 | supports (in theory) resolutions ranging from 1x1 to 1024x1024, |
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt index c6341745df37..8f78ded4b648 100644 --- a/Documentation/filesystems/autofs4-mount-control.txt +++ b/Documentation/filesystems/autofs4-mount-control.txt | |||
@@ -369,7 +369,7 @@ The call requires an initialized struct autofs_dev_ioctl. There are two | |||
369 | possible variations. Both use the path field set to the path of the mount | 369 | possible variations. Both use the path field set to the path of the mount |
370 | point to check and the size field adjusted appropriately. One uses the | 370 | point to check and the size field adjusted appropriately. One uses the |
371 | ioctlfd field to identify a specific mount point to check while the other | 371 | ioctlfd field to identify a specific mount point to check while the other |
372 | variation uses the path and optionaly arg1 set to an autofs mount type. | 372 | variation uses the path and optionally arg1 set to an autofs mount type. |
373 | The call returns 1 if this is a mount point and sets arg1 to the device | 373 | The call returns 1 if this is a mount point and sets arg1 to the device |
374 | number of the mount and field arg2 to the relevant super block magic | 374 | number of the mount and field arg2 to the relevant super block magic |
375 | number (described below) or 0 if it isn't a mountpoint. In both cases | 375 | number (described below) or 0 if it isn't a mountpoint. In both cases |
diff --git a/Documentation/filesystems/caching/netfs-api.txt b/Documentation/filesystems/caching/netfs-api.txt index 4db125b3a5c6..2666b1ed5e9e 100644 --- a/Documentation/filesystems/caching/netfs-api.txt +++ b/Documentation/filesystems/caching/netfs-api.txt | |||
@@ -184,7 +184,7 @@ This has the following fields: | |||
184 | have index children. | 184 | have index children. |
185 | 185 | ||
186 | If this function is not supplied or if it returns NULL then the first | 186 | If this function is not supplied or if it returns NULL then the first |
187 | cache in the parent's list will be chosed, or failing that, the first | 187 | cache in the parent's list will be chosen, or failing that, the first |
188 | cache in the master list. | 188 | cache in the master list. |
189 | 189 | ||
190 | (4) A function to retrieve an object's key from the netfs [mandatory]. | 190 | (4) A function to retrieve an object's key from the netfs [mandatory]. |
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt index 97882df04865..608fdba97b72 100644 --- a/Documentation/filesystems/ext4.txt +++ b/Documentation/filesystems/ext4.txt | |||
@@ -294,7 +294,7 @@ max_batch_time=usec Maximum amount of time ext4 should wait for | |||
294 | amount of time (on average) that it takes to | 294 | amount of time (on average) that it takes to |
295 | finish committing a transaction. Call this time | 295 | finish committing a transaction. Call this time |
296 | the "commit time". If the time that the | 296 | the "commit time". If the time that the |
297 | transactoin has been running is less than the | 297 | transaction has been running is less than the |
298 | commit time, ext4 will try sleeping for the | 298 | commit time, ext4 will try sleeping for the |
299 | commit time to see if other operations will join | 299 | commit time to see if other operations will join |
300 | the transaction. The commit time is capped by | 300 | the transaction. The commit time is capped by |
@@ -328,7 +328,7 @@ noauto_da_alloc replacing existing files via patterns such as | |||
328 | journal commit, in the default data=ordered | 328 | journal commit, in the default data=ordered |
329 | mode, the data blocks of the new file are forced | 329 | mode, the data blocks of the new file are forced |
330 | to disk before the rename() operation is | 330 | to disk before the rename() operation is |
331 | commited. This provides roughly the same level | 331 | committed. This provides roughly the same level |
332 | of guarantees as ext3, and avoids the | 332 | of guarantees as ext3, and avoids the |
333 | "zero-length" problem that can happen when a | 333 | "zero-length" problem that can happen when a |
334 | system crashes before the delayed allocation | 334 | system crashes before the delayed allocation |
@@ -358,7 +358,7 @@ written to the journal first, and then to its final location. | |||
358 | In the event of a crash, the journal can be replayed, bringing both data and | 358 | In the event of a crash, the journal can be replayed, bringing both data and |
359 | metadata into a consistent state. This mode is the slowest except when data | 359 | metadata into a consistent state. This mode is the slowest except when data |
360 | needs to be read from and written to disk at the same time where it | 360 | needs to be read from and written to disk at the same time where it |
361 | outperforms all others modes. Curently ext4 does not have delayed | 361 | outperforms all others modes. Currently ext4 does not have delayed |
362 | allocation support if this data journalling mode is selected. | 362 | allocation support if this data journalling mode is selected. |
363 | 363 | ||
364 | References | 364 | References |
diff --git a/Documentation/filesystems/fiemap.txt b/Documentation/filesystems/fiemap.txt index 1e3defcfe50b..606233cd4618 100644 --- a/Documentation/filesystems/fiemap.txt +++ b/Documentation/filesystems/fiemap.txt | |||
@@ -204,7 +204,7 @@ fiemap_check_flags() helper: | |||
204 | 204 | ||
205 | int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags); | 205 | int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags); |
206 | 206 | ||
207 | The struct fieinfo should be passed in as recieved from ioctl_fiemap(). The | 207 | The struct fieinfo should be passed in as received from ioctl_fiemap(). The |
208 | set of fiemap flags which the fs understands should be passed via fs_flags. If | 208 | set of fiemap flags which the fs understands should be passed via fs_flags. If |
209 | fiemap_check_flags finds invalid user flags, it will place the bad values in | 209 | fiemap_check_flags finds invalid user flags, it will place the bad values in |
210 | fieinfo->fi_flags and return -EBADR. If the file system gets -EBADR, from | 210 | fieinfo->fi_flags and return -EBADR. If the file system gets -EBADR, from |
diff --git a/Documentation/filesystems/nfs-rdma.txt b/Documentation/filesystems/nfs-rdma.txt index 85eaeaddd27c..e386f7e4bcee 100644 --- a/Documentation/filesystems/nfs-rdma.txt +++ b/Documentation/filesystems/nfs-rdma.txt | |||
@@ -100,7 +100,7 @@ Installation | |||
100 | $ sudo cp utils/mount/mount.nfs /sbin/mount.nfs | 100 | $ sudo cp utils/mount/mount.nfs /sbin/mount.nfs |
101 | 101 | ||
102 | In this location, mount.nfs will be invoked automatically for NFS mounts | 102 | In this location, mount.nfs will be invoked automatically for NFS mounts |
103 | by the system mount commmand. | 103 | by the system mount command. |
104 | 104 | ||
105 | NOTE: mount.nfs and therefore nfs-utils-1.1.2 or greater is only needed | 105 | NOTE: mount.nfs and therefore nfs-utils-1.1.2 or greater is only needed |
106 | on the NFS client machine. You do not need this specific version of | 106 | on the NFS client machine. You do not need this specific version of |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index ce84cfc9eae0..cd8717a36271 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -366,7 +366,7 @@ just those considered 'most important'. The new vectors are: | |||
366 | RES, CAL, TLB -- rescheduling, call and TLB flush interrupts are | 366 | RES, CAL, TLB -- rescheduling, call and TLB flush interrupts are |
367 | sent from one CPU to another per the needs of the OS. Typically, | 367 | sent from one CPU to another per the needs of the OS. Typically, |
368 | their statistics are used by kernel developers and interested users to | 368 | their statistics are used by kernel developers and interested users to |
369 | determine the occurance of interrupt of the given type. | 369 | determine the occurrence of interrupts of the given type. |
370 | 370 | ||
371 | The above IRQ vectors are displayed only when relevent. For example, | 371 | The above IRQ vectors are displayed only when relevent. For example, |
372 | the threshold vector does not exist on x86_64 platforms. Others are | 372 | the threshold vector does not exist on x86_64 platforms. Others are |
@@ -551,7 +551,7 @@ Committed_AS: The amount of memory presently allocated on the system. | |||
551 | memory once that memory has been successfully allocated. | 551 | memory once that memory has been successfully allocated. |
552 | VmallocTotal: total size of vmalloc memory area | 552 | VmallocTotal: total size of vmalloc memory area |
553 | VmallocUsed: amount of vmalloc area which is used | 553 | VmallocUsed: amount of vmalloc area which is used |
554 | VmallocChunk: largest contigious block of vmalloc area which is free | 554 | VmallocChunk: largest contiguous block of vmalloc area which is free |
555 | 555 | ||
556 | .............................................................................. | 556 | .............................................................................. |
557 | 557 | ||
diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt index 26e4b8bc53ee..85354b32d731 100644 --- a/Documentation/filesystems/sysfs-pci.txt +++ b/Documentation/filesystems/sysfs-pci.txt | |||
@@ -72,7 +72,7 @@ The 'rom' file is special in that it provides read-only access to the device's | |||
72 | ROM file, if available. It's disabled by default, however, so applications | 72 | ROM file, if available. It's disabled by default, however, so applications |
73 | should write the string "1" to the file to enable it before attempting a read | 73 | should write the string "1" to the file to enable it before attempting a read |
74 | call, and disable it following the access by writing "0" to the file. Note | 74 | call, and disable it following the access by writing "0" to the file. Note |
75 | that the device must be enabled for a rom read to return data succesfully. | 75 | that the device must be enabled for a rom read to return data successfully. |
76 | In the event a driver is not bound to the device, it can be enabled using the | 76 | In the event a driver is not bound to the device, it can be enabled using the |
77 | 'enable' file, documented above. | 77 | 'enable' file, documented above. |
78 | 78 | ||
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index 3a5ddc96901a..5147be5e13cd 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt | |||
@@ -124,10 +124,10 @@ sys_immutable -- If set, ATTR_SYS attribute on FAT is handled as | |||
124 | flush -- If set, the filesystem will try to flush to disk more | 124 | flush -- If set, the filesystem will try to flush to disk more |
125 | early than normal. Not set by default. | 125 | early than normal. Not set by default. |
126 | 126 | ||
127 | rodir -- FAT has the ATTR_RO (read-only) attribute. But on Windows, | 127 | rodir -- FAT has the ATTR_RO (read-only) attribute. On Windows, |
128 | the ATTR_RO of the directory will be just ignored actually, | 128 | the ATTR_RO of the directory will just be ignored, |
129 | and is used by only applications as flag. E.g. it's setted | 129 | and is used only by applications as a flag (e.g. it's set |
130 | for the customized folder. | 130 | for the customized folder). |
131 | 131 | ||
132 | If you want to use ATTR_RO as read-only flag even for | 132 | If you want to use ATTR_RO as read-only flag even for |
133 | the directory, set this option. | 133 | the directory, set this option. |
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt index 145c25a170c7..e4b6985044a2 100644 --- a/Documentation/gpio.txt +++ b/Documentation/gpio.txt | |||
@@ -458,7 +458,7 @@ debugfs interface, since it provides control over GPIO direction and | |||
458 | value instead of just showing a gpio state summary. Plus, it could be | 458 | value instead of just showing a gpio state summary. Plus, it could be |
459 | present on production systems without debugging support. | 459 | present on production systems without debugging support. |
460 | 460 | ||
461 | Given approprate hardware documentation for the system, userspace could | 461 | Given appropriate hardware documentation for the system, userspace could |
462 | know for example that GPIO #23 controls the write protect line used to | 462 | know for example that GPIO #23 controls the write protect line used to |
463 | protect boot loader segments in flash memory. System upgrade procedures | 463 | protect boot loader segments in flash memory. System upgrade procedures |
464 | may need to temporarily remove that protection, first importing a GPIO, | 464 | may need to temporarily remove that protection, first importing a GPIO, |
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt index 3f4bc840da8b..cab61d842259 100644 --- a/Documentation/kdump/kdump.txt +++ b/Documentation/kdump/kdump.txt | |||
@@ -108,7 +108,7 @@ There are two possible methods of using Kdump. | |||
108 | 108 | ||
109 | 2) Or use the system kernel binary itself as dump-capture kernel and there is | 109 | 2) Or use the system kernel binary itself as dump-capture kernel and there is |
110 | no need to build a separate dump-capture kernel. This is possible | 110 | no need to build a separate dump-capture kernel. This is possible |
111 | only with the architecutres which support a relocatable kernel. As | 111 | only with the architectures which support a relocatable kernel. As |
112 | of today, i386, x86_64, ppc64 and ia64 architectures support relocatable | 112 | of today, i386, x86_64, ppc64 and ia64 architectures support relocatable |
113 | kernel. | 113 | kernel. |
114 | 114 | ||
@@ -222,7 +222,7 @@ Dump-capture kernel config options (Arch Dependent, ia64) | |||
222 | ---------------------------------------------------------- | 222 | ---------------------------------------------------------- |
223 | 223 | ||
224 | - No specific options are required to create a dump-capture kernel | 224 | - No specific options are required to create a dump-capture kernel |
225 | for ia64, other than those specified in the arch idependent section | 225 | for ia64, other than those specified in the arch independent section |
226 | above. This means that it is possible to use the system kernel | 226 | above. This means that it is possible to use the system kernel |
227 | as a dump-capture kernel if desired. | 227 | as a dump-capture kernel if desired. |
228 | 228 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0bf8a882ee9e..5f66ba295c5d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1073,7 +1073,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1073 | 1073 | ||
1074 | kgdboc= [HW] kgdb over consoles. | 1074 | kgdboc= [HW] kgdb over consoles. |
1075 | Requires a tty driver that supports console polling. | 1075 | Requires a tty driver that supports console polling. |
1076 | (only serial suported for now) | 1076 | (only serial supported for now) |
1077 | Format: <serial_device>[,baud] | 1077 | Format: <serial_device>[,baud] |
1078 | 1078 | ||
1079 | kmac= [MIPS] korina ethernet MAC address. | 1079 | kmac= [MIPS] korina ethernet MAC address. |
@@ -1402,7 +1402,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1402 | ('y', default) or cooked coordinates ('n') | 1402 | ('y', default) or cooked coordinates ('n') |
1403 | 1403 | ||
1404 | mtrr_chunk_size=nn[KMG] [X86] | 1404 | mtrr_chunk_size=nn[KMG] [X86] |
1405 | used for mtrr cleanup. It is largest continous chunk | 1405 | used for mtrr cleanup. It is largest continuous chunk |
1406 | that could hold holes aka. UC entries. | 1406 | that could hold holes aka. UC entries. |
1407 | 1407 | ||
1408 | mtrr_gran_size=nn[KMG] [X86] | 1408 | mtrr_gran_size=nn[KMG] [X86] |
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index b2e374586bd8..c79ab996dada 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
@@ -132,7 +132,7 @@ kobject_name(): | |||
132 | const char *kobject_name(const struct kobject * kobj); | 132 | const char *kobject_name(const struct kobject * kobj); |
133 | 133 | ||
134 | There is a helper function to both initialize and add the kobject to the | 134 | There is a helper function to both initialize and add the kobject to the |
135 | kernel at the same time, called supprisingly enough kobject_init_and_add(): | 135 | kernel at the same time, called surprisingly enough kobject_init_and_add(): |
136 | 136 | ||
137 | int kobject_init_and_add(struct kobject *kobj, struct kobj_type *ktype, | 137 | int kobject_init_and_add(struct kobject *kobj, struct kobj_type *ktype, |
138 | struct kobject *parent, const char *fmt, ...); | 138 | struct kobject *parent, const char *fmt, ...); |
diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt index 5ee2a02b3b40..0768fcc3ba3e 100644 --- a/Documentation/laptops/acer-wmi.txt +++ b/Documentation/laptops/acer-wmi.txt | |||
@@ -40,7 +40,7 @@ NOTE: The Acer Aspire One is not supported hardware. It cannot work with | |||
40 | acer-wmi until Acer fix their ACPI-WMI implementation on them, so has been | 40 | acer-wmi until Acer fix their ACPI-WMI implementation on them, so has been |
41 | blacklisted until that happens. | 41 | blacklisted until that happens. |
42 | 42 | ||
43 | Please see the website for the current list of known working hardare: | 43 | Please see the website for the current list of known working hardware: |
44 | 44 | ||
45 | http://code.google.com/p/aceracpi/wiki/SupportedHardware | 45 | http://code.google.com/p/aceracpi/wiki/SupportedHardware |
46 | 46 | ||
diff --git a/Documentation/laptops/sony-laptop.txt b/Documentation/laptops/sony-laptop.txt index 8b2bc1572d98..23ce7d350d1a 100644 --- a/Documentation/laptops/sony-laptop.txt +++ b/Documentation/laptops/sony-laptop.txt | |||
@@ -22,7 +22,7 @@ If your laptop model supports it, you will find sysfs files in the | |||
22 | /sys/class/backlight/sony/ | 22 | /sys/class/backlight/sony/ |
23 | directory. You will be able to query and set the current screen | 23 | directory. You will be able to query and set the current screen |
24 | brightness: | 24 | brightness: |
25 | brightness get/set screen brightness (an iteger | 25 | brightness get/set screen brightness (an integer |
26 | between 0 and 7) | 26 | between 0 and 7) |
27 | actual_brightness reading from this file will query the HW | 27 | actual_brightness reading from this file will query the HW |
28 | to get real brightness value | 28 | to get real brightness value |
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index e7e9a69069e1..78e354b42f67 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
@@ -506,7 +506,7 @@ generate input device EV_KEY events. | |||
506 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW | 506 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW |
507 | events for switches: | 507 | events for switches: |
508 | 508 | ||
509 | SW_RFKILL_ALL T60 and later hardare rfkill rocker switch | 509 | SW_RFKILL_ALL T60 and later hardware rfkill rocker switch |
510 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A | 510 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A |
511 | 511 | ||
512 | Non hot-key ACPI HKEY event map: | 512 | Non hot-key ACPI HKEY event map: |
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt index 23045b8b50f0..300da4bdfdbd 100644 --- a/Documentation/local_ops.txt +++ b/Documentation/local_ops.txt | |||
@@ -34,7 +34,7 @@ out of order wrt other memory writes by the owner CPU. | |||
34 | 34 | ||
35 | It can be done by slightly modifying the standard atomic operations : only | 35 | It can be done by slightly modifying the standard atomic operations : only |
36 | their UP variant must be kept. It typically means removing LOCK prefix (on | 36 | their UP variant must be kept. It typically means removing LOCK prefix (on |
37 | i386 and x86_64) and any SMP sychronization barrier. If the architecture does | 37 | i386 and x86_64) and any SMP synchronization barrier. If the architecture does |
38 | not have a different behavior between SMP and UP, including asm-generic/local.h | 38 | not have a different behavior between SMP and UP, including asm-generic/local.h |
39 | in your architecture's local.h is sufficient. | 39 | in your architecture's local.h is sufficient. |
40 | 40 | ||
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt index 4c2ecf537a4a..bbc8a6a36921 100644 --- a/Documentation/memory-hotplug.txt +++ b/Documentation/memory-hotplug.txt | |||
@@ -73,13 +73,13 @@ this phase is triggered automatically. ACPI can notify this event. If not, | |||
73 | (see Section 4.). | 73 | (see Section 4.). |
74 | 74 | ||
75 | Logical Memory Hotplug phase is to change memory state into | 75 | Logical Memory Hotplug phase is to change memory state into |
76 | avaiable/unavailable for users. Amount of memory from user's view is | 76 | available/unavailable for users. Amount of memory from user's view is |
77 | changed by this phase. The kernel makes all memory in it as free pages | 77 | changed by this phase. The kernel makes all memory in it as free pages |
78 | when a memory range is available. | 78 | when a memory range is available. |
79 | 79 | ||
80 | In this document, this phase is described as online/offline. | 80 | In this document, this phase is described as online/offline. |
81 | 81 | ||
82 | Logical Memory Hotplug phase is triggred by write of sysfs file by system | 82 | Logical Memory Hotplug phase is triggered by write of sysfs file by system |
83 | administrator. For the hot-add case, it must be executed after Physical Hotplug | 83 | administrator. For the hot-add case, it must be executed after Physical Hotplug |
84 | phase by hand. | 84 | phase by hand. |
85 | (However, if you writes udev's hotplug scripts for memory hotplug, these | 85 | (However, if you writes udev's hotplug scripts for memory hotplug, these |
@@ -334,7 +334,7 @@ MEMORY_CANCEL_ONLINE | |||
334 | Generated if MEMORY_GOING_ONLINE fails. | 334 | Generated if MEMORY_GOING_ONLINE fails. |
335 | 335 | ||
336 | MEMORY_ONLINE | 336 | MEMORY_ONLINE |
337 | Generated when memory has succesfully brought online. The callback may | 337 | Generated when memory has successfully brought online. The callback may |
338 | allocate pages from the new memory. | 338 | allocate pages from the new memory. |
339 | 339 | ||
340 | MEMORY_GOING_OFFLINE | 340 | MEMORY_GOING_OFFLINE |
@@ -359,7 +359,7 @@ The third argument is passed by pointer of struct memory_notify. | |||
359 | struct memory_notify { | 359 | struct memory_notify { |
360 | unsigned long start_pfn; | 360 | unsigned long start_pfn; |
361 | unsigned long nr_pages; | 361 | unsigned long nr_pages; |
362 | int status_cahnge_nid; | 362 | int status_change_nid; |
363 | } | 363 | } |
364 | 364 | ||
365 | start_pfn is start_pfn of online/offline memory. | 365 | start_pfn is start_pfn of online/offline memory. |
diff --git a/Documentation/mn10300/ABI.txt b/Documentation/mn10300/ABI.txt index 1fef1f06dfd2..d3507bad428d 100644 --- a/Documentation/mn10300/ABI.txt +++ b/Documentation/mn10300/ABI.txt | |||
@@ -26,7 +26,7 @@ registers and the stack. If the first argument is a 64-bit value, it will be | |||
26 | passed in D0:D1. If the first argument is not a 64-bit value, but the second | 26 | passed in D0:D1. If the first argument is not a 64-bit value, but the second |
27 | is, the second will be passed entirely on the stack and D1 will be unused. | 27 | is, the second will be passed entirely on the stack and D1 will be unused. |
28 | 28 | ||
29 | Arguments smaller than 32-bits are not coelesced within a register or a stack | 29 | Arguments smaller than 32-bits are not coalesced within a register or a stack |
30 | word. For example, two byte-sized arguments will always be passed in separate | 30 | word. For example, two byte-sized arguments will always be passed in separate |
31 | registers or word-sized stack slots. | 31 | registers or word-sized stack slots. |
32 | 32 | ||
diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/mtd/nand_ecc.txt index bdf93b7f0f24..274821b35a7f 100644 --- a/Documentation/mtd/nand_ecc.txt +++ b/Documentation/mtd/nand_ecc.txt | |||
@@ -50,7 +50,7 @@ byte 255: bit7 bit6 bit5 bit4 bit3 bit2 bit1 bit0 rp1 rp3 rp5 ... rp15 | |||
50 | cp5 cp5 cp5 cp5 cp4 cp4 cp4 cp4 | 50 | cp5 cp5 cp5 cp5 cp4 cp4 cp4 cp4 |
51 | 51 | ||
52 | This figure represents a sector of 256 bytes. | 52 | This figure represents a sector of 256 bytes. |
53 | cp is my abbreviaton for column parity, rp for row parity. | 53 | cp is my abbreviation for column parity, rp for row parity. |
54 | 54 | ||
55 | Let's start to explain column parity. | 55 | Let's start to explain column parity. |
56 | cp0 is the parity that belongs to all bit0, bit2, bit4, bit6. | 56 | cp0 is the parity that belongs to all bit0, bit2, bit4, bit6. |
@@ -560,7 +560,7 @@ Measuring this code again showed big gain. When executing the original | |||
560 | linux code 1 million times, this took about 1 second on my system. | 560 | linux code 1 million times, this took about 1 second on my system. |
561 | (using time to measure the performance). After this iteration I was back | 561 | (using time to measure the performance). After this iteration I was back |
562 | to 0.075 sec. Actually I had to decide to start measuring over 10 | 562 | to 0.075 sec. Actually I had to decide to start measuring over 10 |
563 | million interations in order not to loose too much accuracy. This one | 563 | million iterations in order not to lose too much accuracy. This one |
564 | definitely seemed to be the jackpot! | 564 | definitely seemed to be the jackpot! |
565 | 565 | ||
566 | There is a little bit more room for improvement though. There are three | 566 | There is a little bit more room for improvement though. There are three |
@@ -571,8 +571,8 @@ loop; This eliminates 3 statements per loop. Of course after the loop we | |||
571 | need to correct by adding: | 571 | need to correct by adding: |
572 | rp4 ^= rp4_6; | 572 | rp4 ^= rp4_6; |
573 | rp6 ^= rp4_6 | 573 | rp6 ^= rp4_6 |
574 | Furthermore there are 4 sequential assingments to rp8. This can be | 574 | Furthermore there are 4 sequential assignments to rp8. This can be |
575 | encoded slightly more efficient by saving tmppar before those 4 lines | 575 | encoded slightly more efficiently by saving tmppar before those 4 lines |
576 | and later do rp8 = rp8 ^ tmppar ^ notrp8; | 576 | and later do rp8 = rp8 ^ tmppar ^ notrp8; |
577 | (where notrp8 is the value of rp8 before those 4 lines). | 577 | (where notrp8 is the value of rp8 before those 4 lines). |
578 | Again a use of the commutative property of xor. | 578 | Again a use of the commutative property of xor. |
@@ -622,7 +622,7 @@ Not a big change, but every penny counts :-) | |||
622 | Analysis 7 | 622 | Analysis 7 |
623 | ========== | 623 | ========== |
624 | 624 | ||
625 | Acutally this made things worse. Not very much, but I don't want to move | 625 | Actually this made things worse. Not very much, but I don't want to move |
626 | into the wrong direction. Maybe something to investigate later. Could | 626 | into the wrong direction. Maybe something to investigate later. Could |
627 | have to do with caching again. | 627 | have to do with caching again. |
628 | 628 | ||
@@ -642,7 +642,7 @@ Analysis 8 | |||
642 | This makes things worse. Let's stick with attempt 6 and continue from there. | 642 | This makes things worse. Let's stick with attempt 6 and continue from there. |
643 | Although it seems that the code within the loop cannot be optimised | 643 | Although it seems that the code within the loop cannot be optimised |
644 | further there is still room to optimize the generation of the ecc codes. | 644 | further there is still room to optimize the generation of the ecc codes. |
645 | We can simply calcualate the total parity. If this is 0 then rp4 = rp5 | 645 | We can simply calculate the total parity. If this is 0 then rp4 = rp5 |
646 | etc. If the parity is 1, then rp4 = !rp5; | 646 | etc. If the parity is 1, then rp4 = !rp5; |
647 | But if rp4 = rp5 we do not need rp5 etc. We can just write the even bits | 647 | But if rp4 = rp5 we do not need rp5 etc. We can just write the even bits |
648 | in the result byte and then do something like | 648 | in the result byte and then do something like |
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index 08762750f121..d5181ce9ff62 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt | |||
@@ -221,7 +221,7 @@ ad_select | |||
221 | 221 | ||
222 | - Any slave's 802.3ad association state changes | 222 | - Any slave's 802.3ad association state changes |
223 | 223 | ||
224 | - The bond's adminstrative state changes to up | 224 | - The bond's administrative state changes to up |
225 | 225 | ||
226 | count or 2 | 226 | count or 2 |
227 | 227 | ||
@@ -369,7 +369,7 @@ fail_over_mac | |||
369 | When this policy is used in conjuction with the mii | 369 | When this policy is used in conjuction with the mii |
370 | monitor, devices which assert link up prior to being | 370 | monitor, devices which assert link up prior to being |
371 | able to actually transmit and receive are particularly | 371 | able to actually transmit and receive are particularly |
372 | susecptible to loss of the gratuitous ARP, and an | 372 | susceptible to loss of the gratuitous ARP, and an |
373 | appropriate updelay setting may be required. | 373 | appropriate updelay setting may be required. |
374 | 374 | ||
375 | follow or 2 | 375 | follow or 2 |
@@ -1794,7 +1794,7 @@ target to query. | |||
1794 | generally referred to as "trunk failover." This is a feature of the | 1794 | generally referred to as "trunk failover." This is a feature of the |
1795 | switch that causes the link state of a particular switch port to be set | 1795 | switch that causes the link state of a particular switch port to be set |
1796 | down (or up) when the state of another switch port goes down (or up). | 1796 | down (or up) when the state of another switch port goes down (or up). |
1797 | It's purpose is to propogate link failures from logically "exterior" ports | 1797 | Its purpose is to propagate link failures from logically "exterior" ports |
1798 | to the logically "interior" ports that bonding is able to monitor via | 1798 | to the logically "interior" ports that bonding is able to monitor via |
1799 | miimon. Availability and configuration for trunk failover varies by | 1799 | miimon. Availability and configuration for trunk failover varies by |
1800 | switch, but this can be a viable alternative to the ARP monitor when using | 1800 | switch, but this can be a viable alternative to the ARP monitor when using |
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt index 2035bc4932f2..463d9e029ef3 100644 --- a/Documentation/networking/can.txt +++ b/Documentation/networking/can.txt | |||
@@ -327,7 +327,7 @@ solution for a couple of reasons: | |||
327 | return 1; | 327 | return 1; |
328 | } | 328 | } |
329 | 329 | ||
330 | /* paraniod check ... */ | 330 | /* paranoid check ... */ |
331 | if (nbytes < sizeof(struct can_frame)) { | 331 | if (nbytes < sizeof(struct can_frame)) { |
332 | fprintf(stderr, "read: incomplete CAN frame\n"); | 332 | fprintf(stderr, "read: incomplete CAN frame\n"); |
333 | return 1; | 333 | return 1; |
diff --git a/Documentation/networking/dm9000.txt b/Documentation/networking/dm9000.txt index 65df3dea5561..5552e2e575c5 100644 --- a/Documentation/networking/dm9000.txt +++ b/Documentation/networking/dm9000.txt | |||
@@ -129,7 +129,7 @@ PHY Link state polling | |||
129 | ---------------------- | 129 | ---------------------- |
130 | 130 | ||
131 | The driver keeps track of the link state and informs the network core | 131 | The driver keeps track of the link state and informs the network core |
132 | about link (carrier) availablilty. This is managed by several methods | 132 | about link (carrier) availability. This is managed by several methods |
133 | depending on the version of the chip and on which PHY is being used. | 133 | depending on the version of the chip and on which PHY is being used. |
134 | 134 | ||
135 | For the internal PHY, the original (and currently default) method is | 135 | For the internal PHY, the original (and currently default) method is |
diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l2tp.txt index 2451f551c505..63214b280e00 100644 --- a/Documentation/networking/l2tp.txt +++ b/Documentation/networking/l2tp.txt | |||
@@ -158,7 +158,7 @@ Sample Userspace Code | |||
158 | } | 158 | } |
159 | return 0; | 159 | return 0; |
160 | 160 | ||
161 | Miscellanous | 161 | Miscellaneous |
162 | ============ | 162 | ============ |
163 | 163 | ||
164 | The PPPoL2TP driver was developed as part of the OpenL2TP project by | 164 | The PPPoL2TP driver was developed as part of the OpenL2TP project by |
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt index a2ab6a0b116d..87b3d15f523a 100644 --- a/Documentation/networking/netdevices.txt +++ b/Documentation/networking/netdevices.txt | |||
@@ -74,7 +74,7 @@ dev->hard_start_xmit: | |||
74 | for this and return NETDEV_TX_LOCKED when the spin lock fails. | 74 | for this and return NETDEV_TX_LOCKED when the spin lock fails. |
75 | The locking there should also properly protect against | 75 | The locking there should also properly protect against |
76 | set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated. | 76 | set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated. |
77 | Dont use it for new drivers. | 77 | Don't use it for new drivers. |
78 | 78 | ||
79 | Context: Process with BHs disabled or BH (timer), | 79 | Context: Process with BHs disabled or BH (timer), |
80 | will be called with interrupts disabled by netconsole. | 80 | will be called with interrupts disabled by netconsole. |
diff --git a/Documentation/networking/phonet.txt b/Documentation/networking/phonet.txt index 6a07e45d4a93..6e8ce09f9c73 100644 --- a/Documentation/networking/phonet.txt +++ b/Documentation/networking/phonet.txt | |||
@@ -36,7 +36,7 @@ Phonet packets have a common header as follows: | |||
36 | On Linux, the link-layer header includes the pn_media byte (see below). | 36 | On Linux, the link-layer header includes the pn_media byte (see below). |
37 | The next 7 bytes are part of the network-layer header. | 37 | The next 7 bytes are part of the network-layer header. |
38 | 38 | ||
39 | The device ID is split: the 6 higher-order bits consitute the device | 39 | The device ID is split: the 6 higher-order bits constitute the device |
40 | address, while the 2 lower-order bits are used for multiplexing, as are | 40 | address, while the 2 lower-order bits are used for multiplexing, as are |
41 | the 8-bit object identifiers. As such, Phonet can be considered as a | 41 | the 8-bit object identifiers. As such, Phonet can be considered as a |
42 | network layer with 6 bits of address space and 10 bits for transport | 42 | network layer with 6 bits of address space and 10 bits for transport |
diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt index dcf31648414a..eaa1a25946c1 100644 --- a/Documentation/networking/regulatory.txt +++ b/Documentation/networking/regulatory.txt | |||
@@ -89,7 +89,7 @@ added to this document when its support is enabled. | |||
89 | Device drivers who provide their own built regulatory domain | 89 | Device drivers who provide their own built regulatory domain |
90 | do not need a callback as the channels registered by them are | 90 | do not need a callback as the channels registered by them are |
91 | the only ones that will be allowed and therefore *additional* | 91 | the only ones that will be allowed and therefore *additional* |
92 | cannels cannot be enabled. | 92 | channels cannot be enabled. |
93 | 93 | ||
94 | Example code - drivers hinting an alpha2: | 94 | Example code - drivers hinting an alpha2: |
95 | ------------------------------------------ | 95 | ------------------------------------------ |
diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt index 82b7a43aadba..5f83fd24ea84 100644 --- a/Documentation/power/regulator/consumer.txt +++ b/Documentation/power/regulator/consumer.txt | |||
@@ -178,5 +178,5 @@ Consumers can uregister interest by calling :- | |||
178 | int regulator_unregister_notifier(struct regulator *regulator, | 178 | int regulator_unregister_notifier(struct regulator *regulator, |
179 | struct notifier_block *nb); | 179 | struct notifier_block *nb); |
180 | 180 | ||
181 | Regulators use the kernel notifier framework to send event to thier interested | 181 | Regulators use the kernel notifier framework to send event to their interested |
182 | consumers. | 182 | consumers. |
diff --git a/Documentation/power/regulator/overview.txt b/Documentation/power/regulator/overview.txt index bdcb332bd7fb..0cded696ca01 100644 --- a/Documentation/power/regulator/overview.txt +++ b/Documentation/power/regulator/overview.txt | |||
@@ -119,7 +119,7 @@ Some terms used in this document:- | |||
119 | battery power, USB power) | 119 | battery power, USB power) |
120 | 120 | ||
121 | Regulator Domains: is the new current limit within the | 121 | Regulator Domains: is the new current limit within the |
122 | regulator operating parameters for input/ouput voltage. | 122 | regulator operating parameters for input/output voltage. |
123 | 123 | ||
124 | If the regulator request passes all the constraint tests | 124 | If the regulator request passes all the constraint tests |
125 | then the new regulator value is applied. | 125 | then the new regulator value is applied. |
diff --git a/Documentation/power/s2ram.txt b/Documentation/power/s2ram.txt index 2ebdc6091ce1..514b94fc931e 100644 --- a/Documentation/power/s2ram.txt +++ b/Documentation/power/s2ram.txt | |||
@@ -63,7 +63,7 @@ hardware during resume operations where a value can be set that will | |||
63 | survive a reboot. | 63 | survive a reboot. |
64 | 64 | ||
65 | Consequence is that after a resume (even if it is successful) your system | 65 | Consequence is that after a resume (even if it is successful) your system |
66 | clock will have a value corresponding to the magic mumber instead of the | 66 | clock will have a value corresponding to the magic number instead of the |
67 | correct date/time! It is therefore advisable to use a program like ntp-date | 67 | correct date/time! It is therefore advisable to use a program like ntp-date |
68 | or rdate to reset the correct date/time from an external time source when | 68 | or rdate to reset the correct date/time from an external time source when |
69 | using this trace option. | 69 | using this trace option. |
diff --git a/Documentation/power/userland-swsusp.txt b/Documentation/power/userland-swsusp.txt index 7b99636564c8..b967cd9137d6 100644 --- a/Documentation/power/userland-swsusp.txt +++ b/Documentation/power/userland-swsusp.txt | |||
@@ -109,7 +109,7 @@ unfreeze user space processes frozen by SNAPSHOT_UNFREEZE if they are | |||
109 | still frozen when the device is being closed). | 109 | still frozen when the device is being closed). |
110 | 110 | ||
111 | Currently it is assumed that the userland utilities reading/writing the | 111 | Currently it is assumed that the userland utilities reading/writing the |
112 | snapshot image from/to the kernel will use a swap parition, called the resume | 112 | snapshot image from/to the kernel will use a swap partition, called the resume |
113 | partition, or a swap file as storage space (if a swap file is used, the resume | 113 | partition, or a swap file as storage space (if a swap file is used, the resume |
114 | partition is the partition that holds this file). However, this is not really | 114 | partition is the partition that holds this file). However, this is not really |
115 | required, as they can use, for example, a special (blank) suspend partition or | 115 | required, as they can use, for example, a special (blank) suspend partition or |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index d16b7a1c3793..8d999d862d0e 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -1356,7 +1356,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
1356 | - phy-map : 1 cell, optional, bitmap of addresses to probe the PHY | 1356 | - phy-map : 1 cell, optional, bitmap of addresses to probe the PHY |
1357 | for, used if phy-address is absent. bit 0x00000001 is | 1357 | for, used if phy-address is absent. bit 0x00000001 is |
1358 | MDIO address 0. | 1358 | MDIO address 0. |
1359 | For Axon it can be absent, thouugh my current driver | 1359 | For Axon it can be absent, though my current driver |
1360 | doesn't handle phy-address yet so for now, keep | 1360 | doesn't handle phy-address yet so for now, keep |
1361 | 0x00ffffff in it. | 1361 | 0x00ffffff in it. |
1362 | - rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec | 1362 | - rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec |
@@ -1438,7 +1438,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
1438 | 1438 | ||
1439 | The Xilinx EDK toolchain ships with a set of IP cores (devices) for use | 1439 | The Xilinx EDK toolchain ships with a set of IP cores (devices) for use |
1440 | in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range | 1440 | in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range |
1441 | of standard device types (network, serial, etc.) and miscellanious | 1441 | of standard device types (network, serial, etc.) and miscellaneous |
1442 | devices (gpio, LCD, spi, etc). Also, since these devices are | 1442 | devices (gpio, LCD, spi, etc). Also, since these devices are |
1443 | implemented within the fpga fabric every instance of the device can be | 1443 | implemented within the fpga fabric every instance of the device can be |
1444 | synthesised with different options that change the behaviour. | 1444 | synthesised with different options that change the behaviour. |
diff --git a/Documentation/powerpc/dts-bindings/fsl/board.txt b/Documentation/powerpc/dts-bindings/fsl/board.txt index 6c974d28eeb4..e8b5bc24d0ac 100644 --- a/Documentation/powerpc/dts-bindings/fsl/board.txt +++ b/Documentation/powerpc/dts-bindings/fsl/board.txt | |||
@@ -38,7 +38,7 @@ Required properities: | |||
38 | - reg : Should contain the address and the length of the GPIO bank | 38 | - reg : Should contain the address and the length of the GPIO bank |
39 | register. | 39 | register. |
40 | - #gpio-cells : Should be two. The first cell is the pin number and the | 40 | - #gpio-cells : Should be two. The first cell is the pin number and the |
41 | second cell is used to specify optional paramters (currently unused). | 41 | second cell is used to specify optional parameters (currently unused). |
42 | - gpio-controller : Marks the port as GPIO controller. | 42 | - gpio-controller : Marks the port as GPIO controller. |
43 | 43 | ||
44 | Example: | 44 | Example: |
diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt index 088fc471e03a..160c752484b4 100644 --- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt +++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt | |||
@@ -19,7 +19,7 @@ Example: | |||
19 | reg = <119c0 30>; | 19 | reg = <119c0 30>; |
20 | } | 20 | } |
21 | 21 | ||
22 | * Properties common to mulitple CPM/QE devices | 22 | * Properties common to multiple CPM/QE devices |
23 | 23 | ||
24 | - fsl,cpm-command : This value is ORed with the opcode and command flag | 24 | - fsl,cpm-command : This value is ORed with the opcode and command flag |
25 | to specify the device on which a CPM command operates. | 25 | to specify the device on which a CPM command operates. |
diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt index 1815dfede1bc..349f79fd7076 100644 --- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt +++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | |||
@@ -11,7 +11,7 @@ Required properties: | |||
11 | "fsl,cpm1-pario-bank-c", "fsl,cpm1-pario-bank-d", | 11 | "fsl,cpm1-pario-bank-c", "fsl,cpm1-pario-bank-d", |
12 | "fsl,cpm1-pario-bank-e", "fsl,cpm2-pario-bank" | 12 | "fsl,cpm1-pario-bank-e", "fsl,cpm2-pario-bank" |
13 | - #gpio-cells : Should be two. The first cell is the pin number and the | 13 | - #gpio-cells : Should be two. The first cell is the pin number and the |
14 | second cell is used to specify optional paramters (currently unused). | 14 | second cell is used to specify optional parameters (currently unused). |
15 | - gpio-controller : Marks the port as GPIO controller. | 15 | - gpio-controller : Marks the port as GPIO controller. |
16 | 16 | ||
17 | Example of three SOC GPIO banks defined as gpio-controller nodes: | 17 | Example of three SOC GPIO banks defined as gpio-controller nodes: |
diff --git a/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt b/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt index b26b91992c55..bcc30bac6831 100644 --- a/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt +++ b/Documentation/powerpc/dts-bindings/fsl/msi-pic.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | * Freescale MSI interrupt controller | 1 | * Freescale MSI interrupt controller |
2 | 2 | ||
3 | Reguired properities: | 3 | Required properties: |
4 | - compatible : compatible list, contains 2 entries, | 4 | - compatible : compatible list, contains 2 entries, |
5 | first is "fsl,CHIP-msi", where CHIP is the processor(mpc8610, mpc8572, | 5 | first is "fsl,CHIP-msi", where CHIP is the processor(mpc8610, mpc8572, |
6 | etc.) and the second is "fsl,mpic-msi" or "fsl,ipic-msi" depending on | 6 | etc.) and the second is "fsl,mpic-msi" or "fsl,ipic-msi" depending on |
diff --git a/Documentation/powerpc/dts-bindings/fsl/pmc.txt b/Documentation/powerpc/dts-bindings/fsl/pmc.txt index 02f6f43ee1b7..07256b7ffcaa 100644 --- a/Documentation/powerpc/dts-bindings/fsl/pmc.txt +++ b/Documentation/powerpc/dts-bindings/fsl/pmc.txt | |||
@@ -15,8 +15,8 @@ Properties: | |||
15 | compatible; all statements below that apply to "fsl,mpc8548-pmc" also | 15 | compatible; all statements below that apply to "fsl,mpc8548-pmc" also |
16 | apply to "fsl,mpc8641d-pmc". | 16 | apply to "fsl,mpc8641d-pmc". |
17 | 17 | ||
18 | Compatibility does not include bit assigments in SCCR/PMCDR/DEVDISR; these | 18 | Compatibility does not include bit assignments in SCCR/PMCDR/DEVDISR; these |
19 | bit assigments are indicated via the sleep specifier in each device's | 19 | bit assignments are indicated via the sleep specifier in each device's |
20 | sleep property. | 20 | sleep property. |
21 | 21 | ||
22 | - reg: For devices compatible with "fsl,mpc8349-pmc", the first resource | 22 | - reg: For devices compatible with "fsl,mpc8349-pmc", the first resource |
diff --git a/Documentation/powerpc/qe_firmware.txt b/Documentation/powerpc/qe_firmware.txt index 06da4d4b44f9..2031ddb33d09 100644 --- a/Documentation/powerpc/qe_firmware.txt +++ b/Documentation/powerpc/qe_firmware.txt | |||
@@ -225,7 +225,7 @@ For example, to match the 8323, revision 1.0: | |||
225 | soc.major = 1 | 225 | soc.major = 1 |
226 | soc.minor = 0 | 226 | soc.minor = 0 |
227 | 227 | ||
228 | 'padding' is neccessary for structure alignment. This field ensures that the | 228 | 'padding' is necessary for structure alignment. This field ensures that the |
229 | 'extended_modes' field is aligned on a 64-bit boundary. | 229 | 'extended_modes' field is aligned on a 64-bit boundary. |
230 | 230 | ||
231 | 'extended_modes' is a bitfield that defines special functionality which has an | 231 | 'extended_modes' is a bitfield that defines special functionality which has an |
diff --git a/Documentation/rbtree.txt b/Documentation/rbtree.txt index 7224459b469e..aae8355d3166 100644 --- a/Documentation/rbtree.txt +++ b/Documentation/rbtree.txt | |||
@@ -131,8 +131,8 @@ Example: | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* Add new node and rebalance tree. */ | 133 | /* Add new node and rebalance tree. */ |
134 | rb_link_node(data->node, parent, new); | 134 | rb_link_node(&data->node, parent, new); |
135 | rb_insert_color(data->node, root); | 135 | rb_insert_color(&data->node, root); |
136 | 136 | ||
137 | return TRUE; | 137 | return TRUE; |
138 | } | 138 | } |
@@ -146,10 +146,10 @@ To remove an existing node from a tree, call: | |||
146 | 146 | ||
147 | Example: | 147 | Example: |
148 | 148 | ||
149 | struct mytype *data = mysearch(mytree, "walrus"); | 149 | struct mytype *data = mysearch(&mytree, "walrus"); |
150 | 150 | ||
151 | if (data) { | 151 | if (data) { |
152 | rb_erase(data->node, mytree); | 152 | rb_erase(&data->node, &mytree); |
153 | myfree(data); | 153 | myfree(data); |
154 | } | 154 | } |
155 | 155 | ||
@@ -188,5 +188,5 @@ Example: | |||
188 | 188 | ||
189 | struct rb_node *node; | 189 | struct rb_node *node; |
190 | for (node = rb_first(&mytree); node; node = rb_next(node)) | 190 | for (node = rb_first(&mytree); node; node = rb_next(node)) |
191 | printk("key=%s\n", rb_entry(node, int, keystring)); | 191 | printk("key=%s\n", rb_entry(node, struct mytype, node)->keystring); |
192 | 192 | ||
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index 10711d9f0788..1eb576a023bd 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt | |||
@@ -1984,7 +1984,7 @@ break *$pc | |||
1984 | 1984 | ||
1985 | break *0x400618 | 1985 | break *0x400618 |
1986 | 1986 | ||
1987 | heres a really useful one for large programs | 1987 | Here's a really useful one for large programs |
1988 | rbr | 1988 | rbr |
1989 | Set a breakpoint for all functions matching REGEXP | 1989 | Set a breakpoint for all functions matching REGEXP |
1990 | e.g. | 1990 | e.g. |
@@ -2211,7 +2211,7 @@ Breakpoint 2 at 0x4d87a4: file top.c, line 2609. | |||
2211 | #5 0x51692c in readline_internal () at readline.c:521 | 2211 | #5 0x51692c in readline_internal () at readline.c:521 |
2212 | #6 0x5164fe in readline (prompt=0x7ffff810 "\177ÿøx\177ÿ÷Ø\177ÿøxÀ") | 2212 | #6 0x5164fe in readline (prompt=0x7ffff810 "\177ÿøx\177ÿ÷Ø\177ÿøxÀ") |
2213 | at readline.c:349 | 2213 | at readline.c:349 |
2214 | #7 0x4d7a8a in command_line_input (prrompt=0x564420 "(gdb) ", repeat=1, | 2214 | #7 0x4d7a8a in command_line_input (prompt=0x564420 "(gdb) ", repeat=1, |
2215 | annotation_suffix=0x4d6b44 "prompt") at top.c:2091 | 2215 | annotation_suffix=0x4d6b44 "prompt") at top.c:2091 |
2216 | #8 0x4d6cf0 in command_loop () at top.c:1345 | 2216 | #8 0x4d6cf0 in command_loop () at top.c:1345 |
2217 | #9 0x4e25bc in main (argc=1, argv=0x7ffffdf4) at main.c:635 | 2217 | #9 0x4e25bc in main (argc=1, argv=0x7ffffdf4) at main.c:635 |
diff --git a/Documentation/scheduler/sched-nice-design.txt b/Documentation/scheduler/sched-nice-design.txt index e2bae5a577e3..3ac1e46d5365 100644 --- a/Documentation/scheduler/sched-nice-design.txt +++ b/Documentation/scheduler/sched-nice-design.txt | |||
@@ -55,7 +55,7 @@ To sum it up: we always wanted to make nice levels more consistent, but | |||
55 | within the constraints of HZ and jiffies and their nasty design level | 55 | within the constraints of HZ and jiffies and their nasty design level |
56 | coupling to timeslices and granularity it was not really viable. | 56 | coupling to timeslices and granularity it was not really viable. |
57 | 57 | ||
58 | The second (less frequent but still periodically occuring) complaint | 58 | The second (less frequent but still periodically occurring) complaint |
59 | about Linux's nice level support was its assymetry around the origo | 59 | about Linux's nice level support was its assymetry around the origo |
60 | (which you can see demonstrated in the picture above), or more | 60 | (which you can see demonstrated in the picture above), or more |
61 | accurately: the fact that nice level behavior depended on the _absolute_ | 61 | accurately: the fact that nice level behavior depended on the _absolute_ |
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt index 683ccae00ad4..c014eccaf19f 100644 --- a/Documentation/scsi/aic79xx.txt +++ b/Documentation/scsi/aic79xx.txt | |||
@@ -194,7 +194,7 @@ The following information is available in this file: | |||
194 | - Packetized SCSI Protocol at 160MB/s and 320MB/s | 194 | - Packetized SCSI Protocol at 160MB/s and 320MB/s |
195 | - Quick Arbitration Selection (QAS) | 195 | - Quick Arbitration Selection (QAS) |
196 | - Retained Training Information (Rev B. ASIC only) | 196 | - Retained Training Information (Rev B. ASIC only) |
197 | - Interrupt Coalessing | 197 | - Interrupt Coalescing |
198 | - Initiator Mode (target mode not currently | 198 | - Initiator Mode (target mode not currently |
199 | supported) | 199 | supported) |
200 | - Support for the PCI-X standard up to 133MHz | 200 | - Support for the PCI-X standard up to 133MHz |
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 230e30846ef2..08e2b4d04aab 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt | |||
@@ -206,7 +206,7 @@ of MOVE MEMORY instructions. | |||
206 | The 896 and the 895A allows handling of the phase mismatch context from | 206 | The 896 and the 895A allows handling of the phase mismatch context from |
207 | SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor | 207 | SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor |
208 | until the C code has saved the context of the transfer). | 208 | until the C code has saved the context of the transfer). |
209 | Implementing this without using LOAD/STORE instructions would be painfull | 209 | Implementing this without using LOAD/STORE instructions would be painful |
210 | and I didn't even want to try it. | 210 | and I didn't even want to try it. |
211 | 211 | ||
212 | The 896 chip supports 64 bit PCI transactions and addressing, while the | 212 | The 896 chip supports 64 bit PCI transactions and addressing, while the |
@@ -240,7 +240,7 @@ characteristics. This feature may also reduce average command latency. | |||
240 | In order to really gain advantage of this feature, devices must have | 240 | In order to really gain advantage of this feature, devices must have |
241 | a reasonable cache size (No miracle is to be expected for a low-end | 241 | a reasonable cache size (No miracle is to be expected for a low-end |
242 | hard disk with 128 KB or less). | 242 | hard disk with 128 KB or less). |
243 | Some kown SCSI devices do not properly support tagged command queuing. | 243 | Some known SCSI devices do not properly support tagged command queuing. |
244 | Generally, firmware revisions that fix this kind of problems are available | 244 | Generally, firmware revisions that fix this kind of problems are available |
245 | at respective vendor web/ftp sites. | 245 | at respective vendor web/ftp sites. |
246 | All I can say is that the hard disks I use on my machines behave well with | 246 | All I can say is that the hard disks I use on my machines behave well with |
diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt index 49ea5c58c6bc..eb9a7b905b64 100644 --- a/Documentation/scsi/sym53c8xx_2.txt +++ b/Documentation/scsi/sym53c8xx_2.txt | |||
@@ -206,7 +206,7 @@ characteristics. This feature may also reduce average command latency. | |||
206 | In order to really gain advantage of this feature, devices must have | 206 | In order to really gain advantage of this feature, devices must have |
207 | a reasonable cache size (No miracle is to be expected for a low-end | 207 | a reasonable cache size (No miracle is to be expected for a low-end |
208 | hard disk with 128 KB or less). | 208 | hard disk with 128 KB or less). |
209 | Some kown old SCSI devices do not properly support tagged command queuing. | 209 | Some known old SCSI devices do not properly support tagged command queuing. |
210 | Generally, firmware revisions that fix this kind of problems are available | 210 | Generally, firmware revisions that fix this kind of problems are available |
211 | at respective vendor web/ftp sites. | 211 | at respective vendor web/ftp sites. |
212 | All I can say is that I never have had problem with tagged queuing using | 212 | All I can say is that I never have had problem with tagged queuing using |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 5c08d96f407c..4252697a95d6 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -773,7 +773,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
773 | single_cmd - Use single immediate commands to communicate with | 773 | single_cmd - Use single immediate commands to communicate with |
774 | codecs (for debugging only) | 774 | codecs (for debugging only) |
775 | enable_msi - Enable Message Signaled Interrupt (MSI) (default = off) | 775 | enable_msi - Enable Message Signaled Interrupt (MSI) (default = off) |
776 | power_save - Automatic power-saving timtout (in second, 0 = | 776 | power_save - Automatic power-saving timeout (in second, 0 = |
777 | disable) | 777 | disable) |
778 | power_save_controller - Reset HD-audio controller in power-saving mode | 778 | power_save_controller - Reset HD-audio controller in power-saving mode |
779 | (default = on) | 779 | (default = on) |
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 88b7433d2f11..71ac995b1915 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt | |||
@@ -16,7 +16,7 @@ methods for the HD-audio hardware. | |||
16 | The HD-audio component consists of two parts: the controller chip and | 16 | The HD-audio component consists of two parts: the controller chip and |
17 | the codec chips on the HD-audio bus. Linux provides a single driver | 17 | the codec chips on the HD-audio bus. Linux provides a single driver |
18 | for all controllers, snd-hda-intel. Although the driver name contains | 18 | for all controllers, snd-hda-intel. Although the driver name contains |
19 | a word of a well-known harware vendor, it's not specific to it but for | 19 | a word of a well-known hardware vendor, it's not specific to it but for |
20 | all controller chips by other companies. Since the HD-audio | 20 | all controller chips by other companies. Since the HD-audio |
21 | controllers are supposed to be compatible, the single snd-hda-driver | 21 | controllers are supposed to be compatible, the single snd-hda-driver |
22 | should work in most cases. But, not surprisingly, there are known | 22 | should work in most cases. But, not surprisingly, there are known |
diff --git a/Documentation/sound/alsa/hda_codec.txt b/Documentation/sound/alsa/hda_codec.txt index 34e87ec1379c..de8efbc7e4bd 100644 --- a/Documentation/sound/alsa/hda_codec.txt +++ b/Documentation/sound/alsa/hda_codec.txt | |||
@@ -114,7 +114,7 @@ For writing a sequence of verbs, use snd_hda_sequence_write(). | |||
114 | 114 | ||
115 | There are variants of cached read/write, snd_hda_codec_write_cache(), | 115 | There are variants of cached read/write, snd_hda_codec_write_cache(), |
116 | snd_hda_sequence_write_cache(). These are used for recording the | 116 | snd_hda_sequence_write_cache(). These are used for recording the |
117 | register states for the power-mangement resume. When no PM is needed, | 117 | register states for the power-management resume. When no PM is needed, |
118 | these are equivalent with non-cached version. | 118 | these are equivalent with non-cached version. |
119 | 119 | ||
120 | To retrieve the number of sub nodes connected to the given node, use | 120 | To retrieve the number of sub nodes connected to the given node, use |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index c302ddf629a0..6fab2dcbb4d3 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
@@ -358,7 +358,7 @@ nr_pdflush_threads | |||
358 | The current number of pdflush threads. This value is read-only. | 358 | The current number of pdflush threads. This value is read-only. |
359 | The value changes according to the number of dirty pages in the system. | 359 | The value changes according to the number of dirty pages in the system. |
360 | 360 | ||
361 | When neccessary, additional pdflush threads are created, one per second, up to | 361 | When necessary, additional pdflush threads are created, one per second, up to |
362 | nr_pdflush_threads_max. | 362 | nr_pdflush_threads_max. |
363 | 363 | ||
364 | ============================================================== | 364 | ============================================================== |
@@ -565,7 +565,7 @@ swappiness | |||
565 | 565 | ||
566 | This control is used to define how aggressive the kernel will swap | 566 | This control is used to define how aggressive the kernel will swap |
567 | memory pages. Higher values will increase agressiveness, lower values | 567 | memory pages. Higher values will increase agressiveness, lower values |
568 | descrease the amount of swap. | 568 | decrease the amount of swap. |
569 | 569 | ||
570 | The default value is 60. | 570 | The default value is 60. |
571 | 571 | ||
diff --git a/Documentation/timers/hpet.txt b/Documentation/timers/hpet.txt index e7c09abcfab4..04763a325520 100644 --- a/Documentation/timers/hpet.txt +++ b/Documentation/timers/hpet.txt | |||
@@ -7,7 +7,7 @@ by Intel and Microsoft which can be found at | |||
7 | 7 | ||
8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") | 8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") |
9 | and up to 32 comparators. Normally three or more comparators are provided, | 9 | and up to 32 comparators. Normally three or more comparators are provided, |
10 | each of which can generate oneshot interupts and at least one of which has | 10 | each of which can generate oneshot interrupts and at least one of which has |
11 | additional hardware to support periodic interrupts. The comparators are | 11 | additional hardware to support periodic interrupts. The comparators are |
12 | also called "timers", which can be misleading since usually timers are | 12 | also called "timers", which can be misleading since usually timers are |
13 | independent of each other ... these share a counter, complicating resets. | 13 | independent of each other ... these share a counter, complicating resets. |
diff --git a/Documentation/timers/timer_stats.txt b/Documentation/timers/timer_stats.txt index 20d368c59814..9bd00fc2e823 100644 --- a/Documentation/timers/timer_stats.txt +++ b/Documentation/timers/timer_stats.txt | |||
@@ -62,7 +62,7 @@ Timerstats sample period: 3.888770 s | |||
62 | 62 | ||
63 | The first column is the number of events, the second column the pid, the third | 63 | The first column is the number of events, the second column the pid, the third |
64 | column is the name of the process. The forth column shows the function which | 64 | column is the name of the process. The forth column shows the function which |
65 | initialized the timer and in parantheses the callback function which was | 65 | initialized the timer and in parenthesis the callback function which was |
66 | executed on expiry. | 66 | executed on expiry. |
67 | 67 | ||
68 | Thomas, Ingo | 68 | Thomas, Ingo |
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 2a82d8602944..7bd27f0e2880 100644 --- a/Documentation/trace/ftrace.txt +++ b/Documentation/trace/ftrace.txt | |||
@@ -1834,4 +1834,4 @@ an error. | |||
1834 | ----------- | 1834 | ----------- |
1835 | 1835 | ||
1836 | More details can be found in the source code, in the | 1836 | More details can be found in the source code, in the |
1837 | kernel/tracing/*.c files. | 1837 | kernel/trace/*.c files. |
diff --git a/Documentation/trace/kmemtrace.txt b/Documentation/trace/kmemtrace.txt index a956d9b7f943..6308735e58ca 100644 --- a/Documentation/trace/kmemtrace.txt +++ b/Documentation/trace/kmemtrace.txt | |||
@@ -64,7 +64,7 @@ III. Quick usage guide | |||
64 | CONFIG_KMEMTRACE). | 64 | CONFIG_KMEMTRACE). |
65 | 65 | ||
66 | 2) Get the userspace tool and build it: | 66 | 2) Get the userspace tool and build it: |
67 | $ git-clone git://repo.or.cz/kmemtrace-user.git # current repository | 67 | $ git clone git://repo.or.cz/kmemtrace-user.git # current repository |
68 | $ cd kmemtrace-user/ | 68 | $ cd kmemtrace-user/ |
69 | $ ./autogen.sh | 69 | $ ./autogen.sh |
70 | $ ./configure | 70 | $ ./configure |
diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt index 4c3d62c7843a..c480e9c32dbd 100644 --- a/Documentation/usb/WUSB-Design-overview.txt +++ b/Documentation/usb/WUSB-Design-overview.txt | |||
@@ -84,7 +84,7 @@ The different logical parts of this driver are: | |||
84 | 84 | ||
85 | *UWB*: the Ultra-Wide-Band stack -- manages the radio and | 85 | *UWB*: the Ultra-Wide-Band stack -- manages the radio and |
86 | associated spectrum to allow for devices sharing it. Allows to | 86 | associated spectrum to allow for devices sharing it. Allows to |
87 | control bandwidth assingment, beaconing, scanning, etc | 87 | control bandwidth assignment, beaconing, scanning, etc |
88 | 88 | ||
89 | * | 89 | * |
90 | 90 | ||
@@ -184,7 +184,7 @@ and sends the replies and notifications back to the API | |||
184 | [/uwb_rc_neh_grok()/]. Notifications are handled to the UWB daemon, that | 184 | [/uwb_rc_neh_grok()/]. Notifications are handled to the UWB daemon, that |
185 | is chartered, among other things, to keep the tab of how the UWB radio | 185 | is chartered, among other things, to keep the tab of how the UWB radio |
186 | neighborhood looks, creating and destroying devices as they show up or | 186 | neighborhood looks, creating and destroying devices as they show up or |
187 | dissapear. | 187 | disappear. |
188 | 188 | ||
189 | Command execution is very simple: a command block is sent and a event | 189 | Command execution is very simple: a command block is sent and a event |
190 | block or reply is expected back. For sending/receiving command/events, a | 190 | block or reply is expected back. For sending/receiving command/events, a |
@@ -333,7 +333,7 @@ read descriptors and move our data. | |||
333 | 333 | ||
334 | *Device life cycle and keep alives* | 334 | *Device life cycle and keep alives* |
335 | 335 | ||
336 | Everytime there is a succesful transfer to/from a device, we update a | 336 | Every time there is a successful transfer to/from a device, we update a |
337 | per-device activity timestamp. If not, every now and then we check and | 337 | per-device activity timestamp. If not, every now and then we check and |
338 | if the activity timestamp gets old, we ping the device by sending it a | 338 | if the activity timestamp gets old, we ping the device by sending it a |
339 | Keep Alive IE; it responds with a /DN_Alive/ pong during the DNTS (this | 339 | Keep Alive IE; it responds with a /DN_Alive/ pong during the DNTS (this |
@@ -411,7 +411,7 @@ context (wa_xfer) and submit it. When the xfer is done, our callback is | |||
411 | called and we assign the status bits and release the xfer resources. | 411 | called and we assign the status bits and release the xfer resources. |
412 | 412 | ||
413 | In dequeue() we are basically cancelling/aborting the transfer. We issue | 413 | In dequeue() we are basically cancelling/aborting the transfer. We issue |
414 | a xfer abort request to the HC, cancell all the URBs we had submitted | 414 | a xfer abort request to the HC, cancel all the URBs we had submitted |
415 | and not yet done and when all that is done, the xfer callback will be | 415 | and not yet done and when all that is done, the xfer callback will be |
416 | called--this will call the URB callback. | 416 | called--this will call the URB callback. |
417 | 417 | ||
diff --git a/Documentation/usb/anchors.txt b/Documentation/usb/anchors.txt index 6f24f566955a..fe6a99a32bbd 100644 --- a/Documentation/usb/anchors.txt +++ b/Documentation/usb/anchors.txt | |||
@@ -27,7 +27,7 @@ Association and disassociation of URBs with anchors | |||
27 | 27 | ||
28 | An association of URBs to an anchor is made by an explicit | 28 | An association of URBs to an anchor is made by an explicit |
29 | call to usb_anchor_urb(). The association is maintained until | 29 | call to usb_anchor_urb(). The association is maintained until |
30 | an URB is finished by (successfull) completion. Thus disassociation | 30 | an URB is finished by (successful) completion. Thus disassociation |
31 | is automatic. A function is provided to forcibly finish (kill) | 31 | is automatic. A function is provided to forcibly finish (kill) |
32 | all URBs associated with an anchor. | 32 | all URBs associated with an anchor. |
33 | Furthermore, disassociation can be made with usb_unanchor_urb() | 33 | Furthermore, disassociation can be made with usb_unanchor_urb() |
@@ -76,4 +76,4 @@ usb_get_from_anchor() | |||
76 | Returns the oldest anchored URB of an anchor. The URB is unanchored | 76 | Returns the oldest anchored URB of an anchor. The URB is unanchored |
77 | and returned with a reference. As you may mix URBs to several | 77 | and returned with a reference. As you may mix URBs to several |
78 | destinations in one anchor you have no guarantee the chronologically | 78 | destinations in one anchor you have no guarantee the chronologically |
79 | first submitted URB is returned. \ No newline at end of file | 79 | first submitted URB is returned. |
diff --git a/Documentation/usb/callbacks.txt b/Documentation/usb/callbacks.txt index 7c812411945b..bfb36b34b79e 100644 --- a/Documentation/usb/callbacks.txt +++ b/Documentation/usb/callbacks.txt | |||
@@ -65,7 +65,7 @@ Accept or decline an interface. If you accept the device return 0, | |||
65 | otherwise -ENODEV or -ENXIO. Other error codes should be used only if a | 65 | otherwise -ENODEV or -ENXIO. Other error codes should be used only if a |
66 | genuine error occurred during initialisation which prevented a driver | 66 | genuine error occurred during initialisation which prevented a driver |
67 | from accepting a device that would else have been accepted. | 67 | from accepting a device that would else have been accepted. |
68 | You are strongly encouraged to use usbcore'sfacility, | 68 | You are strongly encouraged to use usbcore's facility, |
69 | usb_set_intfdata(), to associate a data structure with an interface, so | 69 | usb_set_intfdata(), to associate a data structure with an interface, so |
70 | that you know which internal state and identity you associate with a | 70 | that you know which internal state and identity you associate with a |
71 | particular interface. The device will not be suspended and you may do IO | 71 | particular interface. The device will not be suspended and you may do IO |
diff --git a/Documentation/video4linux/cx18.txt b/Documentation/video4linux/cx18.txt index 914cb7e734a2..4652c0f5da32 100644 --- a/Documentation/video4linux/cx18.txt +++ b/Documentation/video4linux/cx18.txt | |||
@@ -11,7 +11,7 @@ encoder chip: | |||
11 | 2) Some people have problems getting the i2c bus to work. | 11 | 2) Some people have problems getting the i2c bus to work. |
12 | The symptom is that the eeprom cannot be read and the card is | 12 | The symptom is that the eeprom cannot be read and the card is |
13 | unusable. This is probably fixed, but if you have problems | 13 | unusable. This is probably fixed, but if you have problems |
14 | then post to the video4linux or ivtv-users mailinglist. | 14 | then post to the video4linux or ivtv-users mailing list. |
15 | 15 | ||
16 | 3) VBI (raw or sliced) has not yet been implemented. | 16 | 3) VBI (raw or sliced) has not yet been implemented. |
17 | 17 | ||
diff --git a/MAINTAINERS b/MAINTAINERS index 0765bb6aa3cb..9e28c5c16602 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2358,7 +2358,7 @@ F: fs/freevxfs/ | |||
2358 | 2358 | ||
2359 | FREEZER | 2359 | FREEZER |
2360 | P: Pavel Machek | 2360 | P: Pavel Machek |
2361 | M: pavel@suse.cz | 2361 | M: pavel@ucw.cz |
2362 | P: Rafael J. Wysocki | 2362 | P: Rafael J. Wysocki |
2363 | M: rjw@sisk.pl | 2363 | M: rjw@sisk.pl |
2364 | L: linux-pm@lists.linux-foundation.org | 2364 | L: linux-pm@lists.linux-foundation.org |
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 28cf36967977..506a5e5a9ad5 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
@@ -54,7 +54,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse); | |||
54 | * timeout after <timeout> rounds. Needs mcu running before its called. | 54 | * timeout after <timeout> rounds. Needs mcu running before its called. |
55 | * | 55 | * |
56 | * returns : %mcu output on success | 56 | * returns : %mcu output on success |
57 | * : %-ETIMEOUT on timeout | 57 | * : %-ETIMEDOUT on timeout |
58 | */ | 58 | */ |
59 | int jornada_ssp_byte(u8 byte) | 59 | int jornada_ssp_byte(u8 byte) |
60 | { | 60 | { |
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(jornada_ssp_byte); | |||
82 | * jornada_ssp_inout - decide if input is command or trading byte | 82 | * jornada_ssp_inout - decide if input is command or trading byte |
83 | * | 83 | * |
84 | * returns : (jornada_ssp_byte(byte)) on success | 84 | * returns : (jornada_ssp_byte(byte)) on success |
85 | * : %-ETIMEOUT on timeout failure | 85 | * : %-ETIMEDOUT on timeout failure |
86 | */ | 86 | */ |
87 | int jornada_ssp_inout(u8 byte) | 87 | int jornada_ssp_inout(u8 byte) |
88 | { | 88 | { |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index c56fd3eb7c10..a60cfe757914 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -885,7 +885,7 @@ config BFIN_GPTIMERS | |||
885 | are unsure, say N. | 885 | are unsure, say N. |
886 | 886 | ||
887 | To compile this driver as a module, choose M here: the module | 887 | To compile this driver as a module, choose M here: the module |
888 | will be called gptimers.ko. | 888 | will be called gptimers. |
889 | 889 | ||
890 | choice | 890 | choice |
891 | prompt "Uncached DMA region" | 891 | prompt "Uncached DMA region" |
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 89497fb04280..3b52c80e5e33 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * PowerPC64 SLB support. | 2 | * PowerPC64 SLB support. |
3 | * | 3 | * |
4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM | 4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM |
5 | * Based on earlier code writteh by: | 5 | * Based on earlier code written by: |
6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com | 6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com |
7 | * Copyright (c) 2001 Dave Engebretsen | 7 | * Copyright (c) 2001 Dave Engebretsen |
8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM | 8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM |
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 6d227413cbe7..ec6882348520 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
@@ -62,7 +62,7 @@ __HEAD | |||
62 | .org 0x100 | 62 | .org 0x100 |
63 | # | 63 | # |
64 | # subroutine for loading from tape | 64 | # subroutine for loading from tape |
65 | # Paramters: | 65 | # Parameters: |
66 | # R1 = device number | 66 | # R1 = device number |
67 | # R2 = load address | 67 | # R2 = load address |
68 | .Lloader: | 68 | .Lloader: |
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 6273d98d00eb..ac176da1f94e 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -748,9 +748,9 @@ static int ata_acpi_run_tf(struct ata_device *dev, | |||
748 | /** | 748 | /** |
749 | * ata_acpi_exec_tfs - get then write drive taskfile settings | 749 | * ata_acpi_exec_tfs - get then write drive taskfile settings |
750 | * @dev: target ATA device | 750 | * @dev: target ATA device |
751 | * @nr_executed: out paramter for the number of executed commands | 751 | * @nr_executed: out parameter for the number of executed commands |
752 | * | 752 | * |
753 | * Evaluate _GTF and excute returned taskfiles. | 753 | * Evaluate _GTF and execute returned taskfiles. |
754 | * | 754 | * |
755 | * LOCKING: | 755 | * LOCKING: |
756 | * EH context. | 756 | * EH context. |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 94919ad03df1..fa22f94ca415 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -2864,7 +2864,7 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
2864 | /** | 2864 | /** |
2865 | * ata_set_mode - Program timings and issue SET FEATURES - XFER | 2865 | * ata_set_mode - Program timings and issue SET FEATURES - XFER |
2866 | * @link: link on which timings will be programmed | 2866 | * @link: link on which timings will be programmed |
2867 | * @r_failed_dev: out paramter for failed device | 2867 | * @r_failed_dev: out parameter for failed device |
2868 | * | 2868 | * |
2869 | * Set ATA device disk transfer mode (PIO3, UDMA6, etc.). If | 2869 | * Set ATA device disk transfer mode (PIO3, UDMA6, etc.). If |
2870 | * ata_set_mode() fails, pointer to the failing device is | 2870 | * ata_set_mode() fails, pointer to the failing device is |
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index c6599618523e..4b04a15146d7 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -279,7 +279,7 @@ static struct device *next_device(struct klist_iter *i) | |||
279 | * | 279 | * |
280 | * NOTE: The device that returns a non-zero value is not retained | 280 | * NOTE: The device that returns a non-zero value is not retained |
281 | * in any way, nor is its refcount incremented. If the caller needs | 281 | * in any way, nor is its refcount incremented. If the caller needs |
282 | * to retain this data, it should do, and increment the reference | 282 | * to retain this data, it should do so, and increment the reference |
283 | * count in the supplied callback. | 283 | * count in the supplied callback. |
284 | */ | 284 | */ |
285 | int bus_for_each_dev(struct bus_type *bus, struct device *start, | 285 | int bus_for_each_dev(struct bus_type *bus, struct device *start, |
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index ac5e05a98b2f..bb72ada9f074 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -112,7 +112,7 @@ config GDROM | |||
112 | with up to 1 GB of data. This drive will also read standard CD ROM | 112 | with up to 1 GB of data. This drive will also read standard CD ROM |
113 | disks. Select this option to access any disks in your GD ROM drive. | 113 | disks. Select this option to access any disks in your GD ROM drive. |
114 | Most users will want to say "Y" here. | 114 | Most users will want to say "Y" here. |
115 | You can also build this as a module which will be called gdrom.ko | 115 | You can also build this as a module which will be called gdrom. |
116 | 116 | ||
117 | source "drivers/block/paride/Kconfig" | 117 | source "drivers/block/paride/Kconfig" |
118 | 118 | ||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index b1e9652c0d9d..30bae6de6a0d 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -692,7 +692,7 @@ config HVCS | |||
692 | this driver. | 692 | this driver. |
693 | 693 | ||
694 | To compile this driver as a module, choose M here: the | 694 | To compile this driver as a module, choose M here: the |
695 | module will be called hvcs.ko. Additionally, this module | 695 | module will be called hvcs. Additionally, this module |
696 | will depend on arch specific APIs exported from hvcserver.ko | 696 | will depend on arch specific APIs exported from hvcserver.ko |
697 | which will also be compiled when this driver is built as a | 697 | which will also be compiled when this driver is built as a |
698 | module. | 698 | module. |
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index fd3ebd1be570..72429b6b2fa8 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
@@ -779,7 +779,7 @@ static void change_speed(struct async_struct *info, | |||
779 | info->IER |= UART_IER_MSI; | 779 | info->IER |= UART_IER_MSI; |
780 | } | 780 | } |
781 | /* TBD: | 781 | /* TBD: |
782 | * Does clearing IER_MSI imply that we should disbale the VBL interrupt ? | 782 | * Does clearing IER_MSI imply that we should disable the VBL interrupt ? |
783 | */ | 783 | */ |
784 | 784 | ||
785 | /* | 785 | /* |
diff --git a/drivers/connector/Kconfig b/drivers/connector/Kconfig index 100bfd422066..6e6730f9dfd1 100644 --- a/drivers/connector/Kconfig +++ b/drivers/connector/Kconfig | |||
@@ -7,7 +7,7 @@ menuconfig CONNECTOR | |||
7 | of the netlink socket protocol. | 7 | of the netlink socket protocol. |
8 | 8 | ||
9 | Connector support can also be built as a module. If so, the module | 9 | Connector support can also be built as a module. If so, the module |
10 | will be called cn.ko. | 10 | will be called cn. |
11 | 11 | ||
12 | if CONNECTOR | 12 | if CONNECTOR |
13 | 13 | ||
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e748e55bd86b..5b27692372bf 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
@@ -34,7 +34,7 @@ config CRYPTO_DEV_PADLOCK_AES | |||
34 | Available in VIA C3 and newer CPUs. | 34 | Available in VIA C3 and newer CPUs. |
35 | 35 | ||
36 | If unsure say M. The compiled module will be | 36 | If unsure say M. The compiled module will be |
37 | called padlock-aes.ko | 37 | called padlock-aes. |
38 | 38 | ||
39 | config CRYPTO_DEV_PADLOCK_SHA | 39 | config CRYPTO_DEV_PADLOCK_SHA |
40 | tristate "PadLock driver for SHA1 and SHA256 algorithms" | 40 | tristate "PadLock driver for SHA1 and SHA256 algorithms" |
@@ -47,7 +47,7 @@ config CRYPTO_DEV_PADLOCK_SHA | |||
47 | Available in VIA C7 and newer processors. | 47 | Available in VIA C7 and newer processors. |
48 | 48 | ||
49 | If unsure say M. The compiled module will be | 49 | If unsure say M. The compiled module will be |
50 | called padlock-sha.ko | 50 | called padlock-sha. |
51 | 51 | ||
52 | config CRYPTO_DEV_GEODE | 52 | config CRYPTO_DEV_GEODE |
53 | tristate "Support for the Geode LX AES engine" | 53 | tristate "Support for the Geode LX AES engine" |
@@ -79,7 +79,7 @@ config ZCRYPT_MONOLITHIC | |||
79 | bool "Monolithic zcrypt module" | 79 | bool "Monolithic zcrypt module" |
80 | depends on ZCRYPT="m" | 80 | depends on ZCRYPT="m" |
81 | help | 81 | help |
82 | Select this option if you want to have a single module z90crypt.ko | 82 | Select this option if you want to have a single module z90crypt, |
83 | that contains all parts of the crypto device driver (ap bus, | 83 | that contains all parts of the crypto device driver (ap bus, |
84 | request router and all the card drivers). | 84 | request router and all the card drivers). |
85 | 85 | ||
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index facfdb1fa71c..d205d493a68a 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
@@ -1084,7 +1084,7 @@ static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) | |||
1084 | struct pci_dev *dev = pvt->dev_d0f1; | 1084 | struct pci_dev *dev = pvt->dev_d0f1; |
1085 | int enable = 1; | 1085 | int enable = 1; |
1086 | 1086 | ||
1087 | /* Allow module paramter override, else see if CPU supports parity */ | 1087 | /* Allow module parameter override, else see if CPU supports parity */ |
1088 | if (sysbus_parity != -1) { | 1088 | if (sysbus_parity != -1) { |
1089 | enable = sysbus_parity; | 1089 | enable = sysbus_parity; |
1090 | } else if (cpu_id[0] && | 1090 | } else if (cpu_id[0] && |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index cf06494bb744..9a5d0aaac9d0 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -46,7 +46,7 @@ menuconfig IDE | |||
46 | SMART parameters from disk drives. | 46 | SMART parameters from disk drives. |
47 | 47 | ||
48 | To compile this driver as a module, choose M here: the | 48 | To compile this driver as a module, choose M here: the |
49 | module will be called ide-core.ko. | 49 | module will be called ide-core. |
50 | 50 | ||
51 | For further information, please read <file:Documentation/ide/ide.txt>. | 51 | For further information, please read <file:Documentation/ide/ide.txt>. |
52 | 52 | ||
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index bbdd2547f12a..702ef64a0f12 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -577,7 +577,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) | |||
577 | 577 | ||
578 | /* | 578 | /* |
579 | * If necessary schedule the packet transfer to occur 'timeout' | 579 | * If necessary schedule the packet transfer to occur 'timeout' |
580 | * miliseconds later in ide_delayed_transfer_pc() after the | 580 | * milliseconds later in ide_delayed_transfer_pc() after the |
581 | * device says it's ready for a packet. | 581 | * device says it's ready for a packet. |
582 | */ | 582 | */ |
583 | if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { | 583 | if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { |
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 5c0a631d1455..06f46fcc0772 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
@@ -232,7 +232,7 @@ config INPUT_GPIO_ROTARY_ENCODER | |||
232 | depends on GPIOLIB && GENERIC_GPIO | 232 | depends on GPIOLIB && GENERIC_GPIO |
233 | help | 233 | help |
234 | Say Y here to add support for rotary encoders connected to GPIO lines. | 234 | Say Y here to add support for rotary encoders connected to GPIO lines. |
235 | Check file:Documentation/incput/rotary_encoder.txt for more | 235 | Check file:Documentation/input/rotary-encoder.txt for more |
236 | information. | 236 | information. |
237 | 237 | ||
238 | To compile this driver as a module, choose M here: the | 238 | To compile this driver as a module, choose M here: the |
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c index 7d97d54588d9..77e9fdda0597 100644 --- a/drivers/isdn/divert/isdn_divert.c +++ b/drivers/isdn/divert/isdn_divert.c | |||
@@ -183,7 +183,7 @@ int cf_command(int drvid, int mode, | |||
183 | (mode != 1) ? "" : " 0 ", | 183 | (mode != 1) ? "" : " 0 ", |
184 | (mode != 1) ? "" : fwd_nr); | 184 | (mode != 1) ? "" : fwd_nr); |
185 | 185 | ||
186 | retval = divert_if.ll_cmd(&cs->ics); /* excute command */ | 186 | retval = divert_if.ll_cmd(&cs->ics); /* execute command */ |
187 | 187 | ||
188 | if (!retval) | 188 | if (!retval) |
189 | { cs->prev = NULL; | 189 | { cs->prev = NULL; |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 3083338716b2..47dbfe298b43 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -502,7 +502,7 @@ tone_off: | |||
502 | break; | 502 | break; |
503 | } | 503 | } |
504 | dsp->cmx_delay = (*((int *)data)) << 3; | 504 | dsp->cmx_delay = (*((int *)data)) << 3; |
505 | /* miliseconds to samples */ | 505 | /* milliseconds to samples */ |
506 | if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1)) | 506 | if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1)) |
507 | /* clip to half of maximum usable buffer | 507 | /* clip to half of maximum usable buffer |
508 | (half of half buffer) */ | 508 | (half of half buffer) */ |
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 60955a70d880..1bb66e1ed5a7 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig | |||
@@ -216,7 +216,7 @@ config DVB_USB_TTUSB2 | |||
216 | help | 216 | help |
217 | Say Y here to support the Pinnacle 400e DVB-S USB2.0 receiver. The | 217 | Say Y here to support the Pinnacle 400e DVB-S USB2.0 receiver. The |
218 | firmware protocol used by this module is similar to the one used by the | 218 | firmware protocol used by this module is similar to the one used by the |
219 | old ttusb-driver - that's why the module is called dvb-usb-ttusb2.ko. | 219 | old ttusb-driver - that's why the module is called dvb-usb-ttusb2. |
220 | 220 | ||
221 | config DVB_USB_DTT200U | 221 | config DVB_USB_DTT200U |
222 | tristate "WideView WT-200U and WT-220U (pen) DVB-T USB2.0 support (Yakumo/Hama/Typhoon/Yuan)" | 222 | tristate "WideView WT-200U and WT-220U (pen) DVB-T USB2.0 support (Yakumo/Hama/Typhoon/Yuan)" |
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 3e6ffee8dfed..ccd47f57f42c 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c | |||
@@ -181,7 +181,7 @@ static int hdpvr_submit_buffers(struct hdpvr_device *dev) | |||
181 | buff_list); | 181 | buff_list); |
182 | if (buf->status != BUFSTAT_AVAILABLE) { | 182 | if (buf->status != BUFSTAT_AVAILABLE) { |
183 | v4l2_err(&dev->v4l2_dev, | 183 | v4l2_err(&dev->v4l2_dev, |
184 | "buffer not marked as availbale\n"); | 184 | "buffer not marked as available\n"); |
185 | ret = -EFAULT; | 185 | ret = -EFAULT; |
186 | goto err; | 186 | goto err; |
187 | } | 187 | } |
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt index 693e4b511354..fa9249b4971a 100644 --- a/drivers/message/fusion/lsi/mpi_history.txt +++ b/drivers/message/fusion/lsi/mpi_history.txt | |||
@@ -130,7 +130,7 @@ mpi_ioc.h | |||
130 | * 08-08-01 01.02.01 Original release for v1.2 work. | 130 | * 08-08-01 01.02.01 Original release for v1.2 work. |
131 | * New format for FWVersion and ProductId in | 131 | * New format for FWVersion and ProductId in |
132 | * MSG_IOC_FACTS_REPLY and MPI_FW_HEADER. | 132 | * MSG_IOC_FACTS_REPLY and MPI_FW_HEADER. |
133 | * 08-31-01 01.02.02 Addded event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and | 133 | * 08-31-01 01.02.02 Added event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and |
134 | * related structure and defines. | 134 | * related structure and defines. |
135 | * Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED. | 135 | * Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED. |
136 | * Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE. | 136 | * Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE. |
@@ -190,7 +190,7 @@ mpi_ioc.h | |||
190 | * 10-11-06 01.05.12 Added MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED. | 190 | * 10-11-06 01.05.12 Added MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED. |
191 | * Added MaxInitiators field to PortFacts reply. | 191 | * Added MaxInitiators field to PortFacts reply. |
192 | * Added SAS Device Status Change ReasonCode for | 192 | * Added SAS Device Status Change ReasonCode for |
193 | * asynchronous notificaiton. | 193 | * asynchronous notification. |
194 | * Added MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE and event | 194 | * Added MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE and event |
195 | * data structure. | 195 | * data structure. |
196 | * Added new ImageType values for FWDownload and FWUpload | 196 | * Added new ImageType values for FWDownload and FWUpload |
@@ -623,7 +623,7 @@ mpi_fc.h | |||
623 | * 11-02-00 01.01.01 Original release for post 1.0 work | 623 | * 11-02-00 01.01.01 Original release for post 1.0 work |
624 | * 12-04-00 01.01.02 Added messages for Common Transport Send and | 624 | * 12-04-00 01.01.02 Added messages for Common Transport Send and |
625 | * Primitive Send. | 625 | * Primitive Send. |
626 | * 01-09-01 01.01.03 Modifed some of the new flags to have an MPI prefix | 626 | * 01-09-01 01.01.03 Modified some of the new flags to have an MPI prefix |
627 | * and modified the FcPrimitiveSend flags. | 627 | * and modified the FcPrimitiveSend flags. |
628 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger | 628 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger |
629 | * field. | 629 | * field. |
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 7d04fb9ddcaa..b8e35a0b4d72 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
@@ -154,7 +154,8 @@ config MTD_AFS_PARTS | |||
154 | 154 | ||
155 | You will still need the parsing functions to be called by the driver | 155 | You will still need the parsing functions to be called by the driver |
156 | for your particular device. It won't happen automatically. The | 156 | for your particular device. It won't happen automatically. The |
157 | 'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example. | 157 | 'armflash' map driver (CONFIG_MTD_ARM_INTEGRATOR) does this, for |
158 | example. | ||
158 | 159 | ||
159 | config MTD_OF_PARTS | 160 | config MTD_OF_PARTS |
160 | tristate "Flash partition map based on OF description" | 161 | tristate "Flash partition map based on OF description" |
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index 6fde0a2e3567..325fab92a62c 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig | |||
@@ -49,7 +49,7 @@ config MTD_MS02NV | |||
49 | If you want to compile this driver as a module ( = code which can be | 49 | If you want to compile this driver as a module ( = code which can be |
50 | inserted in and removed from the running kernel whenever you want), | 50 | inserted in and removed from the running kernel whenever you want), |
51 | say M here and read <file:Documentation/kbuild/modules.txt>. | 51 | say M here and read <file:Documentation/kbuild/modules.txt>. |
52 | The module will be called ms02-nv.ko. | 52 | The module will be called ms02-nv. |
53 | 53 | ||
54 | config MTD_DATAFLASH | 54 | config MTD_DATAFLASH |
55 | tristate "Support for AT45xxx DataFlash" | 55 | tristate "Support for AT45xxx DataFlash" |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 890936d0275e..f3276897859e 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -260,7 +260,7 @@ config MTD_NAND_BASLER_EXCITE | |||
260 | help | 260 | help |
261 | This enables the driver for the NAND flash device found on the | 261 | This enables the driver for the NAND flash device found on the |
262 | Basler eXcite Smart Camera. If built as a module, the driver | 262 | Basler eXcite Smart Camera. If built as a module, the driver |
263 | will be named "excite_nandflash.ko". | 263 | will be named excite_nandflash. |
264 | 264 | ||
265 | config MTD_NAND_CAFE | 265 | config MTD_NAND_CAFE |
266 | tristate "NAND support for OLPC CAFÉ chip" | 266 | tristate "NAND support for OLPC CAFÉ chip" |
@@ -282,7 +282,7 @@ config MTD_NAND_CS553X | |||
282 | controller is enabled for NAND, and currently requires that | 282 | controller is enabled for NAND, and currently requires that |
283 | the controller be in MMIO mode. | 283 | the controller be in MMIO mode. |
284 | 284 | ||
285 | If you say "m", the module will be called "cs553x_nand.ko". | 285 | If you say "m", the module will be called cs553x_nand. |
286 | 286 | ||
287 | config MTD_NAND_ATMEL | 287 | config MTD_NAND_ATMEL |
288 | tristate "Support for NAND Flash / SmartMedia on AT91 and AVR32" | 288 | tristate "Support for NAND Flash / SmartMedia on AT91 and AVR32" |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f3c4a3b910bb..3111b6c7cbc3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1880,7 +1880,7 @@ config FEC_MPC52xx | |||
1880 | ---help--- | 1880 | ---help--- |
1881 | This option enables support for the MPC5200's on-chip | 1881 | This option enables support for the MPC5200's on-chip |
1882 | Fast Ethernet Controller | 1882 | Fast Ethernet Controller |
1883 | If compiled as module, it will be called 'fec_mpc52xx.ko'. | 1883 | If compiled as module, it will be called fec_mpc52xx. |
1884 | 1884 | ||
1885 | config FEC_MPC52xx_MDIO | 1885 | config FEC_MPC52xx_MDIO |
1886 | bool "MPC52xx FEC MDIO bus driver" | 1886 | bool "MPC52xx FEC MDIO bus driver" |
@@ -1892,7 +1892,7 @@ config FEC_MPC52xx_MDIO | |||
1892 | (Motorola? industry standard). | 1892 | (Motorola? industry standard). |
1893 | If your board uses an external PHY connected to FEC, enable this. | 1893 | If your board uses an external PHY connected to FEC, enable this. |
1894 | If not sure, enable. | 1894 | If not sure, enable. |
1895 | If compiled as module, it will be called 'fec_mpc52xx_phy.ko'. | 1895 | If compiled as module, it will be called fec_mpc52xx_phy. |
1896 | 1896 | ||
1897 | config NE_H8300 | 1897 | config NE_H8300 |
1898 | tristate "NE2000 compatible support for H8/300" | 1898 | tristate "NE2000 compatible support for H8/300" |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 78cc71469136..b642647170be 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -1220,7 +1220,7 @@ static int __init ltpc_setup(char *str) | |||
1220 | if (ints[0] > 2) { | 1220 | if (ints[0] > 2) { |
1221 | dma = ints[3]; | 1221 | dma = ints[3]; |
1222 | } | 1222 | } |
1223 | /* ignore any other paramters */ | 1223 | /* ignore any other parameters */ |
1224 | } | 1224 | } |
1225 | return 1; | 1225 | return 1; |
1226 | } | 1226 | } |
diff --git a/drivers/net/b44.h b/drivers/net/b44.h index e678498de6db..d24158e7f309 100644 --- a/drivers/net/b44.h +++ b/drivers/net/b44.h | |||
@@ -97,7 +97,7 @@ | |||
97 | #define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */ | 97 | #define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */ |
98 | #define DMARX_STAT_CDMASK 0x00000fff /* Current Descriptor Mask */ | 98 | #define DMARX_STAT_CDMASK 0x00000fff /* Current Descriptor Mask */ |
99 | #define DMARX_STAT_SMASK 0x0000f000 /* State Mask */ | 99 | #define DMARX_STAT_SMASK 0x0000f000 /* State Mask */ |
100 | #define DMARX_STAT_SDISABLED 0x00000000 /* State Disbaled */ | 100 | #define DMARX_STAT_SDISABLED 0x00000000 /* State Disabled */ |
101 | #define DMARX_STAT_SACTIVE 0x00001000 /* State Active */ | 101 | #define DMARX_STAT_SACTIVE 0x00001000 /* State Active */ |
102 | #define DMARX_STAT_SIDLE 0x00002000 /* State Idle Wait */ | 102 | #define DMARX_STAT_SIDLE 0x00002000 /* State Idle Wait */ |
103 | #define DMARX_STAT_SSTOPPED 0x00003000 /* State Stopped */ | 103 | #define DMARX_STAT_SSTOPPED 0x00003000 /* State Stopped */ |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 0f9ee1348552..af5364f49550 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2785,7 +2785,7 @@ static int e100_resume(struct pci_dev *pdev) | |||
2785 | /* ack any pending wake events, disable PME */ | 2785 | /* ack any pending wake events, disable PME */ |
2786 | pci_enable_wake(pdev, 0, 0); | 2786 | pci_enable_wake(pdev, 0, 0); |
2787 | 2787 | ||
2788 | /* disbale reverse auto-negotiation */ | 2788 | /* disable reverse auto-negotiation */ |
2789 | if (nic->phy == phy_82552_v) { | 2789 | if (nic->phy == phy_82552_v) { |
2790 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, | 2790 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, |
2791 | E100_82552_SMARTSPEED); | 2791 | E100_82552_SMARTSPEED); |
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index f37360aa12a8..44f0bf23dafc 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
@@ -62,7 +62,7 @@ struct e1000_info; | |||
62 | e_printk(KERN_NOTICE, adapter, format, ## arg) | 62 | e_printk(KERN_NOTICE, adapter, format, ## arg) |
63 | 63 | ||
64 | 64 | ||
65 | /* Interrupt modes, as used by the IntMode paramter */ | 65 | /* Interrupt modes, as used by the IntMode parameter */ |
66 | #define E1000E_INT_MODE_LEGACY 0 | 66 | #define E1000E_INT_MODE_LEGACY 0 |
67 | #define E1000E_INT_MODE_MSI 1 | 67 | #define E1000E_INT_MODE_MSI 1 |
68 | #define E1000E_INT_MODE_MSIX 2 | 68 | #define E1000E_INT_MODE_MSIX 2 |
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 16a41389575a..78952f8324e2 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -268,7 +268,7 @@ struct ehea_qp_init_attr { | |||
268 | }; | 268 | }; |
269 | 269 | ||
270 | /* | 270 | /* |
271 | * Event Queue attributes, passed as paramter | 271 | * Event Queue attributes, passed as parameter |
272 | */ | 272 | */ |
273 | struct ehea_eq_attr { | 273 | struct ehea_eq_attr { |
274 | u32 type; | 274 | u32 type; |
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h index 4bff35e46871..d488733893a6 100644 --- a/drivers/net/igbvf/igbvf.h +++ b/drivers/net/igbvf/igbvf.h | |||
@@ -45,7 +45,7 @@ struct igbvf_adapter; | |||
45 | /* Interrupt defines */ | 45 | /* Interrupt defines */ |
46 | #define IGBVF_START_ITR 648 /* ~6000 ints/sec */ | 46 | #define IGBVF_START_ITR 648 /* ~6000 ints/sec */ |
47 | 47 | ||
48 | /* Interrupt modes, as used by the IntMode paramter */ | 48 | /* Interrupt modes, as used by the IntMode parameter */ |
49 | #define IGBVF_INT_MODE_LEGACY 0 | 49 | #define IGBVF_INT_MODE_LEGACY 0 |
50 | #define IGBVF_INT_MODE_MSI 1 | 50 | #define IGBVF_INT_MODE_MSI 1 |
51 | #define IGBVF_INT_MODE_MSIX 2 | 51 | #define IGBVF_INT_MODE_MSIX 2 |
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index dd9318f19497..dfc2541bb556 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
@@ -514,7 +514,7 @@ enum ipg_regs { | |||
514 | #define IPG_DMALIST_ALIGN_PAD 0x07 | 514 | #define IPG_DMALIST_ALIGN_PAD 0x07 |
515 | #define IPG_MULTICAST_HASHTABLE_SIZE 0x40 | 515 | #define IPG_MULTICAST_HASHTABLE_SIZE 0x40 |
516 | 516 | ||
517 | /* Number of miliseconds to wait after issuing a software reset. | 517 | /* Number of milliseconds to wait after issuing a software reset. |
518 | * 0x05 <= IPG_AC_RESETWAIT to account for proper 10Mbps operation. | 518 | * 0x05 <= IPG_AC_RESETWAIT to account for proper 10Mbps operation. |
519 | */ | 519 | */ |
520 | #define IPG_AC_RESETWAIT 0x05 | 520 | #define IPG_AC_RESETWAIT 0x05 |
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index 7bcc49de1637..e8eeef0c9c9a 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c | |||
@@ -371,7 +371,7 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv) | |||
371 | int i; | 371 | int i; |
372 | 372 | ||
373 | /* If we haven't received a specific coalescing setting | 373 | /* If we haven't received a specific coalescing setting |
374 | * (module param), we set the moderation paramters as follows: | 374 | * (module param), we set the moderation parameters as follows: |
375 | * - moder_cnt is set to the number of mtu sized packets to | 375 | * - moder_cnt is set to the number of mtu sized packets to |
376 | * satisfy our coelsing target. | 376 | * satisfy our coelsing target. |
377 | * - moder_time is set to a fixed value. | 377 | * - moder_time is set to a fixed value. |
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 8754e44cadae..3bd0b5933d59 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
@@ -3242,8 +3242,8 @@ struct niu { | |||
3242 | struct niu_parent *parent; | 3242 | struct niu_parent *parent; |
3243 | 3243 | ||
3244 | u32 flags; | 3244 | u32 flags; |
3245 | #define NIU_FLAGS_HOTPLUG_PHY_PRESENT 0x02000000 /* Removebale PHY detected*/ | 3245 | #define NIU_FLAGS_HOTPLUG_PHY_PRESENT 0x02000000 /* Removeable PHY detected*/ |
3246 | #define NIU_FLAGS_HOTPLUG_PHY 0x01000000 /* Removebale PHY */ | 3246 | #define NIU_FLAGS_HOTPLUG_PHY 0x01000000 /* Removeable PHY */ |
3247 | #define NIU_FLAGS_VPD_VALID 0x00800000 /* VPD has valid version */ | 3247 | #define NIU_FLAGS_VPD_VALID 0x00800000 /* VPD has valid version */ |
3248 | #define NIU_FLAGS_MSIX 0x00400000 /* MSI-X in use */ | 3248 | #define NIU_FLAGS_MSIX 0x00400000 /* MSI-X in use */ |
3249 | #define NIU_FLAGS_MCAST 0x00200000 /* multicast filter enabled */ | 3249 | #define NIU_FLAGS_MCAST 0x00200000 /* multicast filter enabled */ |
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index c92ced247947..1fd5ecb24425 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -3174,7 +3174,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev) | |||
3174 | 3174 | ||
3175 | if (value & RST_FO_FR) { | 3175 | if (value & RST_FO_FR) { |
3176 | QPRINTK(qdev, IFDOWN, ERR, | 3176 | QPRINTK(qdev, IFDOWN, ERR, |
3177 | "ETIMEOUT!!! errored out of resetting the chip!\n"); | 3177 | "ETIMEDOUT!!! errored out of resetting the chip!\n"); |
3178 | status = -ETIMEDOUT; | 3178 | status = -ETIMEDOUT; |
3179 | } | 3179 | } |
3180 | 3180 | ||
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c index 9f81b797f10b..ac9493f6c1a1 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c | |||
@@ -141,7 +141,7 @@ end: | |||
141 | /* We are being asked by firmware to accept | 141 | /* We are being asked by firmware to accept |
142 | * a change to the port. This is only | 142 | * a change to the port. This is only |
143 | * a change to max frame sizes (Tx/Rx), pause | 143 | * a change to max frame sizes (Tx/Rx), pause |
144 | * paramters, or loopback mode. We wake up a worker | 144 | * parameters, or loopback mode. We wake up a worker |
145 | * to handler processing this since a mailbox command | 145 | * to handler processing this since a mailbox command |
146 | * will need to be sent to ACK the request. | 146 | * will need to be sent to ACK the request. |
147 | */ | 147 | */ |
@@ -371,7 +371,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp) | |||
371 | /* We are being asked by firmware to accept | 371 | /* We are being asked by firmware to accept |
372 | * a change to the port. This is only | 372 | * a change to the port. This is only |
373 | * a change to max frame sizes (Tx/Rx), pause | 373 | * a change to max frame sizes (Tx/Rx), pause |
374 | * paramters, or loopback mode. | 374 | * parameters, or loopback mode. |
375 | */ | 375 | */ |
376 | case AEN_IDC_REQ: | 376 | case AEN_IDC_REQ: |
377 | status = ql_idc_req_aen(qdev); | 377 | status = ql_idc_req_aen(qdev); |
@@ -380,7 +380,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp) | |||
380 | /* Process and inbound IDC event. | 380 | /* Process and inbound IDC event. |
381 | * This will happen when we're trying to | 381 | * This will happen when we're trying to |
382 | * change tx/rx max frame size, change pause | 382 | * change tx/rx max frame size, change pause |
383 | * paramters or loopback mode. | 383 | * parameters or loopback mode. |
384 | */ | 384 | */ |
385 | case AEN_IDC_CMPLT: | 385 | case AEN_IDC_CMPLT: |
386 | case AEN_IDC_EXT: | 386 | case AEN_IDC_EXT: |
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/skfp/h/smt.h index 1ff589988d10..2976757a36fb 100644 --- a/drivers/net/skfp/h/smt.h +++ b/drivers/net/skfp/h/smt.h | |||
@@ -413,7 +413,7 @@ struct smt_p_reason { | |||
413 | #define SMT_RDF_SUCCESS 0x00000003 /* success (PMF) */ | 413 | #define SMT_RDF_SUCCESS 0x00000003 /* success (PMF) */ |
414 | #define SMT_RDF_BADSET 0x00000004 /* bad set count (PMF) */ | 414 | #define SMT_RDF_BADSET 0x00000004 /* bad set count (PMF) */ |
415 | #define SMT_RDF_ILLEGAL 0x00000005 /* read only (PMF) */ | 415 | #define SMT_RDF_ILLEGAL 0x00000005 /* read only (PMF) */ |
416 | #define SMT_RDF_NOPARAM 0x6 /* paramter not supported (PMF) */ | 416 | #define SMT_RDF_NOPARAM 0x6 /* parameter not supported (PMF) */ |
417 | #define SMT_RDF_RANGE 0x8 /* out of range */ | 417 | #define SMT_RDF_RANGE 0x8 /* out of range */ |
418 | #define SMT_RDF_AUTHOR 0x9 /* not autohorized */ | 418 | #define SMT_RDF_AUTHOR 0x9 /* not autohorized */ |
419 | #define SMT_RDF_LENGTH 0x0a /* length error */ | 419 | #define SMT_RDF_LENGTH 0x0a /* length error */ |
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 534c0f38483c..0337b9d673f4 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; | |||
79 | MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ; | 79 | MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ; |
80 | MODULE_FIRMWARE(FW_NAME); | 80 | MODULE_FIRMWARE(FW_NAME); |
81 | 81 | ||
82 | /* Module paramters */ | 82 | /* Module parameters */ |
83 | 83 | ||
84 | /* Ring Speed 0,4,16 | 84 | /* Ring Speed 0,4,16 |
85 | * 0 = Autosense | 85 | * 0 = Autosense |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 2e70ee8f1459..46a2cc92d979 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -169,7 +169,7 @@ static char *open_min_error[] = { | |||
169 | "Monitor Contention failer for RPL", "FDX Protocol Error" | 169 | "Monitor Contention failer for RPL", "FDX Protocol Error" |
170 | }; | 170 | }; |
171 | 171 | ||
172 | /* Module paramters */ | 172 | /* Module parameters */ |
173 | 173 | ||
174 | /* Ring Speed 0,4,16 | 174 | /* Ring Speed 0,4,16 |
175 | * 0 = Autosense | 175 | * 0 = Autosense |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index d068a9d36883..2d819fc85589 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -132,7 +132,7 @@ static char *open_min_error[] = {"No error", "Function Failure", "Signal Lost", | |||
132 | "Reserved", "Reserved", "No Monitor Detected for RPL", | 132 | "Reserved", "Reserved", "No Monitor Detected for RPL", |
133 | "Monitor Contention failer for RPL", "FDX Protocol Error"}; | 133 | "Monitor Contention failer for RPL", "FDX Protocol Error"}; |
134 | 134 | ||
135 | /* Module paramters */ | 135 | /* Module parameters */ |
136 | 136 | ||
137 | MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; | 137 | MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; |
138 | MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver") ; | 138 | MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver") ; |
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index 6fcb500257bc..61fe80dda3e3 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * Limitation: | 8 | * Limitation: |
9 | * Can only get/set setttings of the first queue. | 9 | * Can only get/set setttings of the first queue. |
10 | * Need to re-open the interface manually after changing some paramters. | 10 | * Need to re-open the interface manually after changing some parameters. |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify it | 12 | * This program is free software; you can redistribute it and/or modify it |
13 | * under the terms of the GNU General Public License as published by the | 13 | * under the terms of the GNU General Public License as published by the |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f3a2fce6166c..47f68cfa7e21 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -398,7 +398,7 @@ static void rx_complete (struct urb *urb) | |||
398 | 398 | ||
399 | /* stalls need manual reset. this is rare ... except that | 399 | /* stalls need manual reset. this is rare ... except that |
400 | * when going through USB 2.0 TTs, unplug appears this way. | 400 | * when going through USB 2.0 TTs, unplug appears this way. |
401 | * we avoid the highspeed version of the ETIMEOUT/EILSEQ | 401 | * we avoid the highspeed version of the ETIMEDOUT/EILSEQ |
402 | * storm, recovering as needed. | 402 | * storm, recovering as needed. |
403 | */ | 403 | */ |
404 | case -EPIPE: | 404 | case -EPIPE: |
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 3d94e7dfea69..3359497012aa 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -310,7 +310,7 @@ config PRISM54 | |||
310 | If you want to compile the driver as a module ( = code which can be | 310 | If you want to compile the driver as a module ( = code which can be |
311 | inserted in and removed from the running kernel whenever you want), | 311 | inserted in and removed from the running kernel whenever you want), |
312 | say M here and read <file:Documentation/kbuild/modules.txt>. | 312 | say M here and read <file:Documentation/kbuild/modules.txt>. |
313 | The module will be called prism54.ko. | 313 | The module will be called prism54. |
314 | 314 | ||
315 | config USB_ZD1201 | 315 | config USB_ZD1201 |
316 | tristate "USB ZD1201 based Wireless device support" | 316 | tristate "USB ZD1201 based Wireless device support" |
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig index 932d207bce23..c15db2293515 100644 --- a/drivers/net/wireless/hostap/Kconfig +++ b/drivers/net/wireless/hostap/Kconfig | |||
@@ -29,7 +29,7 @@ config HOSTAP | |||
29 | PLX/PCI/CS version of the driver to actually use the driver. | 29 | PLX/PCI/CS version of the driver to actually use the driver. |
30 | 30 | ||
31 | The driver can be compiled as a module and it will be called | 31 | The driver can be compiled as a module and it will be called |
32 | "hostap.ko". | 32 | hostap. |
33 | 33 | ||
34 | config HOSTAP_FIRMWARE | 34 | config HOSTAP_FIRMWARE |
35 | bool "Support downloading firmware images with Host AP driver" | 35 | bool "Support downloading firmware images with Host AP driver" |
@@ -68,7 +68,7 @@ config HOSTAP_PLX | |||
68 | driver. | 68 | driver. |
69 | 69 | ||
70 | The driver can be compiled as a module and will be named | 70 | The driver can be compiled as a module and will be named |
71 | "hostap_plx.ko". | 71 | hostap_plx. |
72 | 72 | ||
73 | config HOSTAP_PCI | 73 | config HOSTAP_PCI |
74 | tristate "Host AP driver for Prism2.5 PCI adaptors" | 74 | tristate "Host AP driver for Prism2.5 PCI adaptors" |
@@ -81,7 +81,7 @@ config HOSTAP_PCI | |||
81 | driver. | 81 | driver. |
82 | 82 | ||
83 | The driver can be compiled as a module and will be named | 83 | The driver can be compiled as a module and will be named |
84 | "hostap_pci.ko". | 84 | hostap_pci. |
85 | 85 | ||
86 | config HOSTAP_CS | 86 | config HOSTAP_CS |
87 | tristate "Host AP driver for Prism2/2.5/3 PC Cards" | 87 | tristate "Host AP driver for Prism2/2.5/3 PC Cards" |
@@ -94,4 +94,4 @@ config HOSTAP_CS | |||
94 | driver. | 94 | driver. |
95 | 95 | ||
96 | The driver can be compiled as a module and will be named | 96 | The driver can be compiled as a module and will be named |
97 | "hostap_cs.ko". | 97 | hostap_cs. |
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 8304f6406a17..736162324ba4 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -75,7 +75,7 @@ config IWLAGN | |||
75 | If you want to compile the driver as a module ( = code which can be | 75 | If you want to compile the driver as a module ( = code which can be |
76 | inserted in and removed from the running kernel whenever you want), | 76 | inserted in and removed from the running kernel whenever you want), |
77 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 77 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
78 | module will be called iwlagn.ko. | 78 | module will be called iwlagn. |
79 | 79 | ||
80 | 80 | ||
81 | config IWL4965 | 81 | config IWL4965 |
@@ -113,7 +113,7 @@ config IWL3945 | |||
113 | If you want to compile the driver as a module ( = code which can be | 113 | If you want to compile the driver as a module ( = code which can be |
114 | inserted in and removed from the running kernel whenever you want), | 114 | inserted in and removed from the running kernel whenever you want), |
115 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 115 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
116 | module will be called iwl3945.ko. | 116 | module will be called iwl3945. |
117 | 117 | ||
118 | config IWL3945_SPECTRUM_MEASUREMENT | 118 | config IWL3945_SPECTRUM_MEASUREMENT |
119 | bool "Enable Spectrum Measurement in iwl3945 driver" | 119 | bool "Enable Spectrum Measurement in iwl3945 driver" |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index bebf735cd4bd..ff0042ffe3e9 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -584,7 +584,7 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param, | |||
584 | ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER, | 584 | ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER, |
585 | infobuf, info_len); | 585 | infobuf, info_len); |
586 | if (ret != 0) | 586 | if (ret != 0) |
587 | devdbg(dev, "setting rndis config paramater failed, %d.", ret); | 587 | devdbg(dev, "setting rndis config parameter failed, %d.", ret); |
588 | 588 | ||
589 | kfree(infobuf); | 589 | kfree(infobuf); |
590 | return ret; | 590 | return ret; |
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig index bfc5d9cf716e..1ae11c7f17af 100644 --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig | |||
@@ -9,11 +9,11 @@ menuconfig RT2X00 | |||
9 | 9 | ||
10 | When building one of the individual drivers, the rt2x00 library | 10 | When building one of the individual drivers, the rt2x00 library |
11 | will also be created. That library (when the driver is built as | 11 | will also be created. That library (when the driver is built as |
12 | a module) will be called "rt2x00lib.ko". | 12 | a module) will be called rt2x00lib. |
13 | 13 | ||
14 | Additionally PCI and USB libraries will also be build depending | 14 | Additionally PCI and USB libraries will also be build depending |
15 | on the types of drivers being selected, these libraries will be | 15 | on the types of drivers being selected, these libraries will be |
16 | called "rt2x00pci.ko" and "rt2x00usb.ko". | 16 | called rt2x00pci and rt2x00usb. |
17 | 17 | ||
18 | if RT2X00 | 18 | if RT2X00 |
19 | 19 | ||
@@ -26,7 +26,7 @@ config RT2400PCI | |||
26 | This adds support for rt2400 wireless chipset family. | 26 | This adds support for rt2400 wireless chipset family. |
27 | Supported chips: RT2460. | 27 | Supported chips: RT2460. |
28 | 28 | ||
29 | When compiled as a module, this driver will be called "rt2400pci.ko". | 29 | When compiled as a module, this driver will be called rt2400pci. |
30 | 30 | ||
31 | config RT2500PCI | 31 | config RT2500PCI |
32 | tristate "Ralink rt2500 (PCI/PCMCIA) support" | 32 | tristate "Ralink rt2500 (PCI/PCMCIA) support" |
@@ -37,7 +37,7 @@ config RT2500PCI | |||
37 | This adds support for rt2500 wireless chipset family. | 37 | This adds support for rt2500 wireless chipset family. |
38 | Supported chips: RT2560. | 38 | Supported chips: RT2560. |
39 | 39 | ||
40 | When compiled as a module, this driver will be called "rt2500pci.ko". | 40 | When compiled as a module, this driver will be called rt2500pci. |
41 | 41 | ||
42 | config RT61PCI | 42 | config RT61PCI |
43 | tristate "Ralink rt2501/rt61 (PCI/PCMCIA) support" | 43 | tristate "Ralink rt2501/rt61 (PCI/PCMCIA) support" |
@@ -51,7 +51,7 @@ config RT61PCI | |||
51 | This adds support for rt2501 wireless chipset family. | 51 | This adds support for rt2501 wireless chipset family. |
52 | Supported chips: RT2561, RT2561S & RT2661. | 52 | Supported chips: RT2561, RT2561S & RT2661. |
53 | 53 | ||
54 | When compiled as a module, this driver will be called "rt61pci.ko". | 54 | When compiled as a module, this driver will be called rt61pci. |
55 | 55 | ||
56 | config RT2500USB | 56 | config RT2500USB |
57 | tristate "Ralink rt2500 (USB) support" | 57 | tristate "Ralink rt2500 (USB) support" |
@@ -62,7 +62,7 @@ config RT2500USB | |||
62 | This adds support for rt2500 wireless chipset family. | 62 | This adds support for rt2500 wireless chipset family. |
63 | Supported chips: RT2571 & RT2572. | 63 | Supported chips: RT2571 & RT2572. |
64 | 64 | ||
65 | When compiled as a module, this driver will be called "rt2500usb.ko". | 65 | When compiled as a module, this driver will be called rt2500usb. |
66 | 66 | ||
67 | config RT73USB | 67 | config RT73USB |
68 | tristate "Ralink rt2501/rt73 (USB) support" | 68 | tristate "Ralink rt2501/rt73 (USB) support" |
@@ -75,7 +75,7 @@ config RT73USB | |||
75 | This adds support for rt2501 wireless chipset family. | 75 | This adds support for rt2501 wireless chipset family. |
76 | Supported chips: RT2571W, RT2573 & RT2671. | 76 | Supported chips: RT2571W, RT2573 & RT2671. |
77 | 77 | ||
78 | When compiled as a module, this driver will be called "rt73usb.ko". | 78 | When compiled as a module, this driver will be called rt73usb. |
79 | 79 | ||
80 | config RT2X00_LIB_PCI | 80 | config RT2X00_LIB_PCI |
81 | tristate | 81 | tristate |
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index a631613177d0..d83e3794d340 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h | |||
@@ -235,7 +235,7 @@ void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna); | |||
235 | * @rt2x00dev: Pointer to &struct rt2x00_dev. | 235 | * @rt2x00dev: Pointer to &struct rt2x00_dev. |
236 | * | 236 | * |
237 | * Initialize work structure and all link tuning related | 237 | * Initialize work structure and all link tuning related |
238 | * paramters. This will not start the link tuning process itself. | 238 | * parameters. This will not start the link tuning process itself. |
239 | */ | 239 | */ |
240 | void rt2x00link_register(struct rt2x00_dev *rt2x00dev); | 240 | void rt2x00link_register(struct rt2x00_dev *rt2x00dev); |
241 | 241 | ||
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index e55b33961aeb..fa2821be44c2 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -138,7 +138,7 @@ psa_read(struct net_device * dev, | |||
138 | 138 | ||
139 | /*------------------------------------------------------------------*/ | 139 | /*------------------------------------------------------------------*/ |
140 | /* | 140 | /* |
141 | * Write the Paramter Storage Area to the WaveLAN card's memory | 141 | * Write the Parameter Storage Area to the WaveLAN card's memory |
142 | */ | 142 | */ |
143 | static void | 143 | static void |
144 | psa_write(struct net_device * dev, | 144 | psa_write(struct net_device * dev, |
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index 3eee70928d45..2d6da78fddb6 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c | |||
@@ -679,7 +679,7 @@ alloc_err: | |||
679 | return rc; | 679 | return rc; |
680 | } | 680 | } |
681 | 681 | ||
682 | static int sn_pci_hotplug_init(void) | 682 | static int __init sn_pci_hotplug_init(void) |
683 | { | 683 | { |
684 | struct pci_bus *pci_bus = NULL; | 684 | struct pci_bus *pci_bus = NULL; |
685 | int rc; | 685 | int rc; |
@@ -716,7 +716,7 @@ static int sn_pci_hotplug_init(void) | |||
716 | return registered == 1 ? 0 : -ENODEV; | 716 | return registered == 1 ? 0 : -ENODEV; |
717 | } | 717 | } |
718 | 718 | ||
719 | static void sn_pci_hotplug_exit(void) | 719 | static void __exit sn_pci_hotplug_exit(void) |
720 | { | 720 | { |
721 | struct hotplug_slot *bss_hotplug_slot; | 721 | struct hotplug_slot *bss_hotplug_slot; |
722 | 722 | ||
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index a7745c82b4ae..cb909a5b5047 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig | |||
@@ -8,7 +8,7 @@ config LCS | |||
8 | Select this option if you want to use LCS networking on IBM System z. | 8 | Select this option if you want to use LCS networking on IBM System z. |
9 | This device driver supports Token Ring (IEEE 802.5), | 9 | This device driver supports Token Ring (IEEE 802.5), |
10 | FDDI (IEEE 802.7) and Ethernet. | 10 | FDDI (IEEE 802.7) and Ethernet. |
11 | To compile as a module, choose M. The module name is lcs.ko. | 11 | To compile as a module, choose M. The module name is lcs. |
12 | If you do not know what it is, it's safe to choose Y. | 12 | If you do not know what it is, it's safe to choose Y. |
13 | 13 | ||
14 | config CTCM | 14 | config CTCM |
@@ -21,7 +21,7 @@ config CTCM | |||
21 | It also supports virtual CTCs when running under VM. | 21 | It also supports virtual CTCs when running under VM. |
22 | This driver also supports channel-to-channel MPC SNA devices. | 22 | This driver also supports channel-to-channel MPC SNA devices. |
23 | MPC is an SNA protocol device used by Communication Server for Linux. | 23 | MPC is an SNA protocol device used by Communication Server for Linux. |
24 | To compile as a module, choose M. The module name is ctcm.ko. | 24 | To compile as a module, choose M. The module name is ctcm. |
25 | To compile into the kernel, choose Y. | 25 | To compile into the kernel, choose Y. |
26 | If you do not need any channel-to-channel connection, choose N. | 26 | If you do not need any channel-to-channel connection, choose N. |
27 | 27 | ||
@@ -34,7 +34,7 @@ config NETIUCV | |||
34 | link between VM guests. Using ifconfig a point-to-point connection | 34 | link between VM guests. Using ifconfig a point-to-point connection |
35 | can be established to the Linux on IBM System z | 35 | can be established to the Linux on IBM System z |
36 | running on the other VM guest. To compile as a module, choose M. | 36 | running on the other VM guest. To compile as a module, choose M. |
37 | The module name is netiucv.ko. If unsure, choose Y. | 37 | The module name is netiucv. If unsure, choose Y. |
38 | 38 | ||
39 | config SMSGIUCV | 39 | config SMSGIUCV |
40 | tristate "IUCV special message support (VM only)" | 40 | tristate "IUCV special message support (VM only)" |
@@ -50,7 +50,7 @@ config CLAW | |||
50 | This driver supports channel attached CLAW devices. | 50 | This driver supports channel attached CLAW devices. |
51 | CLAW is Common Link Access for Workstation. Common devices | 51 | CLAW is Common Link Access for Workstation. Common devices |
52 | that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices. | 52 | that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices. |
53 | To compile as a module, choose M. The module name is claw.ko. | 53 | To compile as a module, choose M. The module name is claw. |
54 | To compile into the kernel, choose Y. | 54 | To compile into the kernel, choose Y. |
55 | 55 | ||
56 | config QETH | 56 | config QETH |
@@ -65,14 +65,14 @@ config QETH | |||
65 | <http://www.ibm.com/developerworks/linux/linux390> | 65 | <http://www.ibm.com/developerworks/linux/linux390> |
66 | 66 | ||
67 | To compile this driver as a module, choose M. | 67 | To compile this driver as a module, choose M. |
68 | The module name is qeth.ko. | 68 | The module name is qeth. |
69 | 69 | ||
70 | config QETH_L2 | 70 | config QETH_L2 |
71 | tristate "qeth layer 2 device support" | 71 | tristate "qeth layer 2 device support" |
72 | depends on QETH | 72 | depends on QETH |
73 | help | 73 | help |
74 | Select this option to be able to run qeth devices in layer 2 mode. | 74 | Select this option to be able to run qeth devices in layer 2 mode. |
75 | To compile as a module, choose M. The module name is qeth_l2.ko. | 75 | To compile as a module, choose M. The module name is qeth_l2. |
76 | If unsure, choose y. | 76 | If unsure, choose y. |
77 | 77 | ||
78 | config QETH_L3 | 78 | config QETH_L3 |
@@ -80,7 +80,7 @@ config QETH_L3 | |||
80 | depends on QETH | 80 | depends on QETH |
81 | help | 81 | help |
82 | Select this option to be able to run qeth devices in layer 3 mode. | 82 | Select this option to be able to run qeth devices in layer 3 mode. |
83 | To compile as a module choose M. The module name is qeth_l3.ko. | 83 | To compile as a module choose M. The module name is qeth_l3. |
84 | If unsure, choose Y. | 84 | If unsure, choose Y. |
85 | 85 | ||
86 | config QETH_IPV6 | 86 | config QETH_IPV6 |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index bb2752b4130f..35493a82d2a8 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
@@ -116,7 +116,7 @@ static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port) | |||
116 | { | 116 | { |
117 | if (atomic_dec_return(&wka_port->refcount) != 0) | 117 | if (atomic_dec_return(&wka_port->refcount) != 0) |
118 | return; | 118 | return; |
119 | /* wait 10 miliseconds, other reqs might pop in */ | 119 | /* wait 10 milliseconds, other reqs might pop in */ |
120 | schedule_delayed_work(&wka_port->work, HZ / 100); | 120 | schedule_delayed_work(&wka_port->work, HZ / 100); |
121 | } | 121 | } |
122 | 122 | ||
diff --git a/drivers/scsi/dpt/osd_util.h b/drivers/scsi/dpt/osd_util.h index 4b56c0436ba2..b2613c2eaac7 100644 --- a/drivers/scsi/dpt/osd_util.h +++ b/drivers/scsi/dpt/osd_util.h | |||
@@ -342,7 +342,7 @@ uLONG osdGetThreadID(void); | |||
342 | /* wakes up the specifed thread */ | 342 | /* wakes up the specifed thread */ |
343 | void osdWakeThread(uLONG); | 343 | void osdWakeThread(uLONG); |
344 | 344 | ||
345 | /* osd sleep for x miliseconds */ | 345 | /* osd sleep for x milliseconds */ |
346 | void osdSleep(uLONG); | 346 | void osdSleep(uLONG); |
347 | 347 | ||
348 | #define DPT_THREAD_PRIORITY_LOWEST 0x00 | 348 | #define DPT_THREAD_PRIORITY_LOWEST 0x00 |
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index e9fa6762044a..7991ba1980ae 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -1174,8 +1174,8 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc) | |||
1174 | * @reftag: out: ref tag (reference tag) | 1174 | * @reftag: out: ref tag (reference tag) |
1175 | * | 1175 | * |
1176 | * Description: | 1176 | * Description: |
1177 | * Extract DIF paramters from the command if possible. Otherwise, | 1177 | * Extract DIF parameters from the command if possible. Otherwise, |
1178 | * use default paratmers. | 1178 | * use default parameters. |
1179 | * | 1179 | * |
1180 | **/ | 1180 | **/ |
1181 | static inline void | 1181 | static inline void |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 795201fa0b48..512c2cc1a33f 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -469,7 +469,7 @@ typedef struct { | |||
469 | u8 type; /* Type of the device */ | 469 | u8 type; /* Type of the device */ |
470 | u8 cur_status; /* current status of the device */ | 470 | u8 cur_status; /* current status of the device */ |
471 | u8 tag_depth; /* Level of tagging */ | 471 | u8 tag_depth; /* Level of tagging */ |
472 | u8 sync_neg; /* sync negotiation - ENABLE or DISBALE */ | 472 | u8 sync_neg; /* sync negotiation - ENABLE or DISABLE */ |
473 | u32 size; /* configurable size in terms of 512 byte | 473 | u32 size; /* configurable size in terms of 512 byte |
474 | blocks */ | 474 | blocks */ |
475 | }__attribute__ ((packed)) phys_drv; | 475 | }__attribute__ ((packed)) phys_drv; |
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h index 170399ef06f4..b25b74764ec3 100644 --- a/drivers/scsi/megaraid/mbox_defs.h +++ b/drivers/scsi/megaraid/mbox_defs.h | |||
@@ -686,7 +686,7 @@ typedef struct { | |||
686 | * @type : Type of the device | 686 | * @type : Type of the device |
687 | * @cur_status : current status of the device | 687 | * @cur_status : current status of the device |
688 | * @tag_depth : Level of tagging | 688 | * @tag_depth : Level of tagging |
689 | * @sync_neg : sync negotiation - ENABLE or DISBALE | 689 | * @sync_neg : sync negotiation - ENABLE or DISABLE |
690 | * @size : configurable size in terms of 512 byte | 690 | * @size : configurable size in terms of 512 byte |
691 | */ | 691 | */ |
692 | typedef struct { | 692 | typedef struct { |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 641e800ed693..1132c5cae7ab 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -861,7 +861,7 @@ config SERIAL_UARTLITE | |||
861 | Say Y here if you want to use the Xilinx uartlite serial controller. | 861 | Say Y here if you want to use the Xilinx uartlite serial controller. |
862 | 862 | ||
863 | To compile this driver as a module, choose M here: the | 863 | To compile this driver as a module, choose M here: the |
864 | module will be called uartlite.ko. | 864 | module will be called uartlite. |
865 | 865 | ||
866 | config SERIAL_UARTLITE_CONSOLE | 866 | config SERIAL_UARTLITE_CONSOLE |
867 | bool "Support for console on Xilinx uartlite serial port" | 867 | bool "Support for console on Xilinx uartlite serial port" |
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt index 9f6772bc68c2..1c2907c1dc81 100644 --- a/drivers/staging/go7007/go7007.txt +++ b/drivers/staging/go7007/go7007.txt | |||
@@ -2,7 +2,7 @@ This is a driver for the WIS GO7007SB multi-format video encoder. | |||
2 | 2 | ||
3 | Pete Eberlein <pete@sensoray.com> | 3 | Pete Eberlein <pete@sensoray.com> |
4 | 4 | ||
5 | The driver was orignally released under the GPL and is currently hosted at: | 5 | The driver was originally released under the GPL and is currently hosted at: |
6 | http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver | 6 | http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver |
7 | The go7007 firmware can be acquired from the package on the site above. | 7 | The go7007 firmware can be acquired from the package on the site above. |
8 | 8 | ||
@@ -24,7 +24,7 @@ These should be used instead of the non-standard GO7007 ioctls described | |||
24 | below. | 24 | below. |
25 | 25 | ||
26 | 26 | ||
27 | The README files from the orignal package appear below: | 27 | The README files from the original package appears below: |
28 | 28 | ||
29 | --------------------------------------------------------------------------- | 29 | --------------------------------------------------------------------------- |
30 | WIS GO7007SB Public Linux Driver | 30 | WIS GO7007SB Public Linux Driver |
diff --git a/drivers/staging/panel/lcd-panel-cgram.txt b/drivers/staging/panel/lcd-panel-cgram.txt index f9ceef4322a3..7f82c905763d 100644 --- a/drivers/staging/panel/lcd-panel-cgram.txt +++ b/drivers/staging/panel/lcd-panel-cgram.txt | |||
@@ -3,7 +3,7 @@ characters 0 to 7. The escape code to define a new character is | |||
3 | '\e[LG' followed by one digit from 0 to 7, representing the character | 3 | '\e[LG' followed by one digit from 0 to 7, representing the character |
4 | number, and up to 8 couples of hex digits terminated by a semi-colon | 4 | number, and up to 8 couples of hex digits terminated by a semi-colon |
5 | (';'). Each couple of digits represents a line, with 1-bits for each | 5 | (';'). Each couple of digits represents a line, with 1-bits for each |
6 | illuminated pixel with LSB on the right. Lines are numberred from the | 6 | illuminated pixel with LSB on the right. Lines are numbered from the |
7 | top of the character to the bottom. On a 5x7 matrix, only the 5 lower | 7 | top of the character to the bottom. On a 5x7 matrix, only the 5 lower |
8 | bits of the 7 first bytes are used for each character. If the string | 8 | bits of the 7 first bytes are used for each character. If the string |
9 | is incomplete, only complete lines will be redefined. Here are some | 9 | is incomplete, only complete lines will be redefined. Here are some |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index c00f9ab9c46c..2edf2999f5c8 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -5664,7 +5664,7 @@ VOID AsicUpdateProtect( | |||
5664 | #if 0 | 5664 | #if 0 |
5665 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); | 5665 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); |
5666 | #else | 5666 | #else |
5667 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5667 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5668 | if (( | 5668 | if (( |
5669 | #ifdef DOT11_N_SUPPORT | 5669 | #ifdef DOT11_N_SUPPORT |
5670 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5670 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c index 8a82cee8bf26..a26bc033337d 100644 --- a/drivers/staging/rt2870/common/mlme.c +++ b/drivers/staging/rt2870/common/mlme.c | |||
@@ -5561,7 +5561,7 @@ VOID AsicUpdateProtect( | |||
5561 | #if 0 | 5561 | #if 0 |
5562 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); | 5562 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); |
5563 | #else | 5563 | #else |
5564 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5564 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5565 | if (( | 5565 | if (( |
5566 | #ifdef DOT11_N_SUPPORT | 5566 | #ifdef DOT11_N_SUPPORT |
5567 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5567 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/staging/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c index 0ffbfa36699e..0189bab013cf 100644 --- a/drivers/staging/rt3070/common/mlme.c +++ b/drivers/staging/rt3070/common/mlme.c | |||
@@ -5575,7 +5575,7 @@ VOID AsicUpdateProtect( | |||
5575 | RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg); | 5575 | RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg); |
5576 | MacReg &= 0xFF0000FF; | 5576 | MacReg &= 0xFF0000FF; |
5577 | 5577 | ||
5578 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5578 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5579 | if (( | 5579 | if (( |
5580 | #ifdef DOT11_N_SUPPORT | 5580 | #ifdef DOT11_N_SUPPORT |
5581 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5581 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 888198c9a106..824e65bdc433 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c | |||
@@ -2424,7 +2424,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len) | |||
2424 | * 0 success | 2424 | * 0 success |
2425 | * >0 f/w reported error - f/w status code | 2425 | * >0 f/w reported error - f/w status code |
2426 | * <0 driver reported error | 2426 | * <0 driver reported error |
2427 | * -ETIMEOUT timout waiting for the cmd regs to become | 2427 | * -ETIMEDOUT timout waiting for the cmd regs to become |
2428 | * available, or waiting for the control reg | 2428 | * available, or waiting for the control reg |
2429 | * to indicate the Aux port is enabled. | 2429 | * to indicate the Aux port is enabled. |
2430 | * -ENODATA the buffer does NOT contain a valid PDA. | 2430 | * -ENODATA the buffer does NOT contain a valid PDA. |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index eabf20eeb370..db964db42d3c 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -102,7 +102,7 @@ struct edgeport_port { | |||
102 | __u8 shadow_mcr; | 102 | __u8 shadow_mcr; |
103 | __u8 shadow_lsr; | 103 | __u8 shadow_lsr; |
104 | __u8 lsr_mask; | 104 | __u8 lsr_mask; |
105 | __u32 ump_read_timeout; /* Number of miliseconds the UMP will | 105 | __u32 ump_read_timeout; /* Number of milliseconds the UMP will |
106 | wait without data before completing | 106 | wait without data before completing |
107 | a read short */ | 107 | a read short */ |
108 | int baud_rate; | 108 | int baud_rate; |
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index 9adbb4f90479..fd2c7bd9dfbe 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig | |||
@@ -8,7 +8,7 @@ menuconfig W1 | |||
8 | If you want W1 support, you should say Y here. | 8 | If you want W1 support, you should say Y here. |
9 | 9 | ||
10 | This W1 support can also be built as a module. If so, the module | 10 | This W1 support can also be built as a module. If so, the module |
11 | will be called wire.ko. | 11 | will be called wire. |
12 | 12 | ||
13 | if W1 | 13 | if W1 |
14 | 14 | ||
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index 96d2f8e4c275..3195fb8b7d9a 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig | |||
@@ -12,7 +12,7 @@ config W1_MASTER_MATROX | |||
12 | using Matrox's G400 GPIO pins. | 12 | using Matrox's G400 GPIO pins. |
13 | 13 | ||
14 | This support is also available as a module. If so, the module | 14 | This support is also available as a module. If so, the module |
15 | will be called matrox_w1.ko. | 15 | will be called matrox_w1. |
16 | 16 | ||
17 | config W1_MASTER_DS2490 | 17 | config W1_MASTER_DS2490 |
18 | tristate "DS2490 USB <-> W1 transport layer for 1-wire" | 18 | tristate "DS2490 USB <-> W1 transport layer for 1-wire" |
@@ -22,7 +22,7 @@ config W1_MASTER_DS2490 | |||
22 | for example DS9490*. | 22 | for example DS9490*. |
23 | 23 | ||
24 | This support is also available as a module. If so, the module | 24 | This support is also available as a module. If so, the module |
25 | will be called ds2490.ko. | 25 | will be called ds2490. |
26 | 26 | ||
27 | config W1_MASTER_DS2482 | 27 | config W1_MASTER_DS2482 |
28 | tristate "Maxim DS2482 I2C to 1-Wire bridge" | 28 | tristate "Maxim DS2482 I2C to 1-Wire bridge" |
@@ -56,7 +56,7 @@ config W1_MASTER_GPIO | |||
56 | GPIO pins. This driver uses the GPIO API to control the wire. | 56 | GPIO pins. This driver uses the GPIO API to control the wire. |
57 | 57 | ||
58 | This support is also available as a module. If so, the module | 58 | This support is also available as a module. If so, the module |
59 | will be called w1-gpio.ko. | 59 | will be called w1-gpio. |
60 | 60 | ||
61 | config HDQ_MASTER_OMAP | 61 | config HDQ_MASTER_OMAP |
62 | tristate "OMAP HDQ driver" | 62 | tristate "OMAP HDQ driver" |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 5744cac4864b..b166f2852a64 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -531,7 +531,7 @@ config SBC8360_WDT | |||
531 | Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com). | 531 | Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com). |
532 | 532 | ||
533 | To compile this driver as a module, choose M here: the | 533 | To compile this driver as a module, choose M here: the |
534 | module will be called sbc8360.ko. | 534 | module will be called sbc8360. |
535 | 535 | ||
536 | Most people will say N. | 536 | Most people will say N. |
537 | 537 | ||
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index 96eb2cbe5874..0c9059676690 100644 --- a/drivers/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c | |||
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file) | |||
192 | if (test_bit(WDT_ENABLED, &wdt_status)) | 192 | if (test_bit(WDT_ENABLED, &wdt_status)) |
193 | state = wdt_disable(); | 193 | state = wdt_disable(); |
194 | 194 | ||
195 | /* if the timer is not disbaled reload and notify that we are still | 195 | /* if the timer is not disabled reload and notify that we are still |
196 | * going down | 196 | * going down |
197 | */ | 197 | */ |
198 | if (state != 0) { | 198 | if (state != 0) { |
@@ -358,9 +358,9 @@ static void bio_kmalloc_destructor(struct bio *bio) | |||
358 | * | 358 | * |
359 | * If %__GFP_WAIT is set, then bio_alloc will always be able to allocate | 359 | * If %__GFP_WAIT is set, then bio_alloc will always be able to allocate |
360 | * a bio. This is due to the mempool guarantees. To make this work, callers | 360 | * a bio. This is due to the mempool guarantees. To make this work, callers |
361 | * must never allocate more than 1 bio at the time from this pool. Callers | 361 | * must never allocate more than 1 bio at a time from this pool. Callers |
362 | * that need to allocate more than 1 bio must always submit the previously | 362 | * that need to allocate more than 1 bio must always submit the previously |
363 | * allocate bio for IO before attempting to allocate a new one. Failure to | 363 | * allocated bio for IO before attempting to allocate a new one. Failure to |
364 | * do so can cause livelocks under memory pressure. | 364 | * do so can cause livelocks under memory pressure. |
365 | * | 365 | * |
366 | **/ | 366 | **/ |
diff --git a/fs/compat.c b/fs/compat.c index 6aefb776dfeb..cdd51a3a7c53 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -471,7 +471,7 @@ asmlinkage long compat_sys_fcntl64(unsigned int fd, unsigned int cmd, | |||
471 | ret = sys_fcntl(fd, cmd, (unsigned long)&f); | 471 | ret = sys_fcntl(fd, cmd, (unsigned long)&f); |
472 | set_fs(old_fs); | 472 | set_fs(old_fs); |
473 | if (cmd == F_GETLK && ret == 0) { | 473 | if (cmd == F_GETLK && ret == 0) { |
474 | /* GETLK was successfule and we need to return the data... | 474 | /* GETLK was successful and we need to return the data... |
475 | * but it needs to fit in the compat structure. | 475 | * but it needs to fit in the compat structure. |
476 | * l_start shouldn't be too big, unless the original | 476 | * l_start shouldn't be too big, unless the original |
477 | * start + end is greater than COMPAT_OFF_T_MAX, in which | 477 | * start + end is greater than COMPAT_OFF_T_MAX, in which |
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index b83f6bcfa51a..0aac371bff0b 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -1765,7 +1765,7 @@ static int do_i2c_smbus_ioctl(unsigned int fd, unsigned int cmd, unsigned long a | |||
1765 | 1765 | ||
1766 | /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE | 1766 | /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE |
1767 | * for some operations; this forces use of the newer bridge-utils that | 1767 | * for some operations; this forces use of the newer bridge-utils that |
1768 | * use compatiable ioctls | 1768 | * use compatible ioctls |
1769 | */ | 1769 | */ |
1770 | static int old_bridge_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) | 1770 | static int old_bridge_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) |
1771 | { | 1771 | { |
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index b2bbf45039e0..f2e5811936d0 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h | |||
@@ -27,7 +27,7 @@ struct ext2_inode_info { | |||
27 | /* | 27 | /* |
28 | * i_block_group is the number of the block group which contains | 28 | * i_block_group is the number of the block group which contains |
29 | * this file's inode. Constant across the lifetime of the inode, | 29 | * this file's inode. Constant across the lifetime of the inode, |
30 | * it is ued for making block allocation decisions - we try to | 30 | * it is used for making block allocation decisions - we try to |
31 | * place a file's data blocks near its inode block, and new inodes | 31 | * place a file's data blocks near its inode block, and new inodes |
32 | * near to their parent directory's inode. | 32 | * near to their parent directory's inode. |
33 | */ | 33 | */ |
diff --git a/fs/inode.c b/fs/inode.c index a88baebf77cf..f643be565df8 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1408,7 +1408,7 @@ EXPORT_SYMBOL(touch_atime); | |||
1408 | * for writeback. Note that this function is meant exclusively for | 1408 | * for writeback. Note that this function is meant exclusively for |
1409 | * usage in the file write path of filesystems, and filesystems may | 1409 | * usage in the file write path of filesystems, and filesystems may |
1410 | * choose to explicitly ignore update via this function with the | 1410 | * choose to explicitly ignore update via this function with the |
1411 | * S_NOCTIME inode flag, e.g. for network filesystem where these | 1411 | * S_NOCMTIME inode flag, e.g. for network filesystem where these |
1412 | * timestamps are handled by the server. | 1412 | * timestamps are handled by the server. |
1413 | */ | 1413 | */ |
1414 | 1414 | ||
diff --git a/include/linux/ultrasound.h b/include/linux/ultrasound.h index 6b7703e75cec..71339dc531c5 100644 --- a/include/linux/ultrasound.h +++ b/include/linux/ultrasound.h | |||
@@ -34,7 +34,7 @@ | |||
34 | * _GUS_VOICEOFF - Stops voice (no parameters) | 34 | * _GUS_VOICEOFF - Stops voice (no parameters) |
35 | * _GUS_VOICEFADE - Stops the voice smoothly. | 35 | * _GUS_VOICEFADE - Stops the voice smoothly. |
36 | * _GUS_VOICEMODE - Alters the voice mode, don't start or stop voice (P1=voice mode) | 36 | * _GUS_VOICEMODE - Alters the voice mode, don't start or stop voice (P1=voice mode) |
37 | * _GUS_VOICEBALA - Sets voice balence (P1, 0=left, 7=middle and 15=right, default 7) | 37 | * _GUS_VOICEBALA - Sets voice balance (P1, 0=left, 7=middle and 15=right, default 7) |
38 | * _GUS_VOICEFREQ - Sets voice (sample) playback frequency (P1=Hz) | 38 | * _GUS_VOICEFREQ - Sets voice (sample) playback frequency (P1=Hz) |
39 | * _GUS_VOICEVOL - Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off) | 39 | * _GUS_VOICEVOL - Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off) |
40 | * _GUS_VOICEVOL2 - Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off) | 40 | * _GUS_VOICEVOL2 - Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off) |
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c index 97890831e1b5..e8b337006276 100644 --- a/kernel/power/poweroff.c +++ b/kernel/power/poweroff.c | |||
@@ -34,7 +34,7 @@ static struct sysrq_key_op sysrq_poweroff_op = { | |||
34 | .handler = handle_poweroff, | 34 | .handler = handle_poweroff, |
35 | .help_msg = "powerOff", | 35 | .help_msg = "powerOff", |
36 | .action_msg = "Power Off", | 36 | .action_msg = "Power Off", |
37 | .enable_mask = SYSRQ_ENABLE_BOOT, | 37 | .enable_mask = SYSRQ_ENABLE_BOOT, |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static int pm_sysrq_init(void) | 40 | static int pm_sysrq_init(void) |
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 820c5af44f3e..fcd107a78c5a 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c | |||
@@ -902,7 +902,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); | |||
902 | * Returns: | 902 | * Returns: |
903 | * 0 on success | 903 | * 0 on success |
904 | * -EINTR when interrupted by a signal | 904 | * -EINTR when interrupted by a signal |
905 | * -ETIMEOUT when the timeout expired | 905 | * -ETIMEDOUT when the timeout expired |
906 | * -EDEADLK when the lock would deadlock (when deadlock detection is on) | 906 | * -EDEADLK when the lock would deadlock (when deadlock detection is on) |
907 | */ | 907 | */ |
908 | int | 908 | int |
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index ca8cb326d1d2..ead6c7a42f44 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
@@ -168,7 +168,7 @@ config IPV6_SIT | |||
168 | into IPv4 packets. This is useful if you want to connect two IPv6 | 168 | into IPv4 packets. This is useful if you want to connect two IPv6 |
169 | networks over an IPv4-only path. | 169 | networks over an IPv4-only path. |
170 | 170 | ||
171 | Saying M here will produce a module called sit.ko. If unsure, say Y. | 171 | Saying M here will produce a module called sit. If unsure, say Y. |
172 | 172 | ||
173 | config IPV6_NDISC_NODETYPE | 173 | config IPV6_NDISC_NODETYPE |
174 | bool | 174 | bool |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a8218bc1806a..597487ae6ce8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2765,7 +2765,7 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags) | |||
2765 | spin_unlock_bh(&ifp->lock); | 2765 | spin_unlock_bh(&ifp->lock); |
2766 | read_unlock_bh(&idev->lock); | 2766 | read_unlock_bh(&idev->lock); |
2767 | /* | 2767 | /* |
2768 | * If the defice is not ready: | 2768 | * If the device is not ready: |
2769 | * - keep it tentative if it is a permanent address. | 2769 | * - keep it tentative if it is a permanent address. |
2770 | * - otherwise, kill it. | 2770 | * - otherwise, kill it. |
2771 | */ | 2771 | */ |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index cb3ad741ebf8..c26a20c58dde 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -327,7 +327,7 @@ config NETFILTER_XT_TARGET_CONNMARK | |||
327 | 327 | ||
328 | If you want to compile it as a module, say M here and read | 328 | If you want to compile it as a module, say M here and read |
329 | <file:Documentation/kbuild/modules.txt>. The module will be called | 329 | <file:Documentation/kbuild/modules.txt>. The module will be called |
330 | ipt_CONNMARK.ko. If unsure, say `N'. | 330 | ipt_CONNMARK. If unsure, say `N'. |
331 | 331 | ||
332 | config NETFILTER_XT_TARGET_CONNSECMARK | 332 | config NETFILTER_XT_TARGET_CONNSECMARK |
333 | tristate '"CONNSECMARK" target support' | 333 | tristate '"CONNSECMARK" target support' |
@@ -584,7 +584,7 @@ config NETFILTER_XT_MATCH_CONNMARK | |||
584 | 584 | ||
585 | If you want to compile it as a module, say M here and read | 585 | If you want to compile it as a module, say M here and read |
586 | <file:Documentation/kbuild/modules.txt>. The module will be called | 586 | <file:Documentation/kbuild/modules.txt>. The module will be called |
587 | ipt_connmark.ko. If unsure, say `N'. | 587 | ipt_connmark. If unsure, say `N'. |
588 | 588 | ||
589 | config NETFILTER_XT_MATCH_CONNTRACK | 589 | config NETFILTER_XT_MATCH_CONNTRACK |
590 | tristate '"conntrack" connection tracking match support' | 590 | tristate '"conntrack" connection tracking match support' |
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c index 9fe8982bd7c9..4a1d94aac20b 100644 --- a/net/netfilter/nf_conntrack_acct.c +++ b/net/netfilter/nf_conntrack_acct.c | |||
@@ -116,7 +116,7 @@ int nf_conntrack_acct_init(struct net *net) | |||
116 | if (net_eq(net, &init_net)) { | 116 | if (net_eq(net, &init_net)) { |
117 | #ifdef CONFIG_NF_CT_ACCT | 117 | #ifdef CONFIG_NF_CT_ACCT |
118 | printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n"); | 118 | printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n"); |
119 | printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n"); | 119 | printk(KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n"); |
120 | printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n"); | 120 | printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n"); |
121 | #endif | 121 | #endif |
122 | 122 | ||
diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c index e4282d93a1aa..21eb6dce46df 100644 --- a/sound/oss/msnd.c +++ b/sound/oss/msnd.c | |||
@@ -100,7 +100,7 @@ void msnd_fifo_free(msnd_fifo *f) | |||
100 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) | 100 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) |
101 | { | 101 | { |
102 | msnd_fifo_free(f); | 102 | msnd_fifo_free(f); |
103 | f->data = (char *)vmalloc(n); | 103 | f->data = vmalloc(n); |
104 | f->n = n; | 104 | f->n = n; |
105 | f->tail = 0; | 105 | f->tail = 0; |
106 | f->head = 0; | 106 | f->head = 0; |
diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c index 6a3891ab69dd..296123ab74f7 100644 --- a/sound/pci/aw2/aw2-saa7146.c +++ b/sound/pci/aw2/aw2-saa7146.c | |||
@@ -108,7 +108,7 @@ void snd_aw2_saa7146_setup(struct snd_aw2_saa7146 *chip, | |||
108 | #endif | 108 | #endif |
109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ | 109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ |
110 | 110 | ||
111 | /* At initialization WS1 and WS2 are disbaled (configured as input */ | 111 | /* At initialization WS1 and WS2 are disabled (configured as input) */ |
112 | acon1 |= 0 * WS1_CTRL; | 112 | acon1 |= 0 * WS1_CTRL; |
113 | acon1 |= 0 * WS2_CTRL; | 113 | acon1 |= 0 * WS2_CTRL; |
114 | 114 | ||
diff --git a/sound/pci/sis7019.h b/sound/pci/sis7019.h index 013b6739a742..bc8c76819408 100644 --- a/sound/pci/sis7019.h +++ b/sound/pci/sis7019.h | |||
@@ -203,7 +203,7 @@ | |||
203 | #define SIS_WEISR_B 0xac | 203 | #define SIS_WEISR_B 0xac |
204 | 204 | ||
205 | 205 | ||
206 | /* Playback DMA parameters (paramter RAM) */ | 206 | /* Playback DMA parameters (parameter RAM) */ |
207 | #define SIS_PLAY_DMA_OFFSET 0x0000 | 207 | #define SIS_PLAY_DMA_OFFSET 0x0000 |
208 | #define SIS_PLAY_DMA_SIZE 0x10 | 208 | #define SIS_PLAY_DMA_SIZE 0x10 |
209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ | 209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ |
@@ -228,7 +228,7 @@ | |||
228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 | 228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 |
229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff | 229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff |
230 | 230 | ||
231 | /* Capture DMA parameters (paramter RAM) */ | 231 | /* Capture DMA parameters (parameter RAM) */ |
232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 | 232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 |
233 | #define SIS_CAPTURE_DMA_SIZE 0x10 | 233 | #define SIS_CAPTURE_DMA_SIZE 0x10 |
234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ | 234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ |
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index c0efe4491116..6416d3f0c7be 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
@@ -367,7 +367,7 @@ static int vx2_load_xilinx_binary(struct vx_core *chip, const struct firmware *x | |||
367 | unsigned int port; | 367 | unsigned int port; |
368 | const unsigned char *image; | 368 | const unsigned char *image; |
369 | 369 | ||
370 | /* XILINX reset (wait at least 1 milisecond between reset on and off). */ | 370 | /* XILINX reset (wait at least 1 millisecond between reset on and off). */ |
371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); | 371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); |
372 | vx_inl(chip, CNTRL); | 372 | vx_inl(chip, CNTRL); |
373 | msleep(10); | 373 | msleep(10); |
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index ecb58e7a6245..4bd3a7a0edc1 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -423,7 +423,7 @@ static int set_ctl_value(struct usb_mixer_elem_info *cval, int request, int vali | |||
423 | value_set = convert_bytes_value(cval, value_set); | 423 | value_set = convert_bytes_value(cval, value_set); |
424 | buf[0] = value_set & 0xff; | 424 | buf[0] = value_set & 0xff; |
425 | buf[1] = (value_set >> 8) & 0xff; | 425 | buf[1] = (value_set >> 8) & 0xff; |
426 | while (timeout -- > 0) | 426 | while (timeout-- > 0) |
427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, | 427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, |
428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), | 428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), |
429 | request, | 429 | request, |