diff options
302 files changed, 438 insertions, 444 deletions
@@ -380,7 +380,7 @@ S: FutureTV Labs Ltd | |||
380 | S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG | 380 | S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG |
381 | S: United Kingdom | 381 | S: United Kingdom |
382 | 382 | ||
383 | N: Thomas Bogendörfer | 383 | N: Thomas Bogendörfer |
384 | E: tsbogend@alpha.franken.de | 384 | E: tsbogend@alpha.franken.de |
385 | D: PCnet32 driver, SONIC driver, JAZZ_ESP driver | 385 | D: PCnet32 driver, SONIC driver, JAZZ_ESP driver |
386 | D: newport abscon driver, g364 framebuffer driver | 386 | D: newport abscon driver, g364 framebuffer driver |
@@ -400,7 +400,7 @@ W: http://math-www.uni-paderborn.de/~axel/ | |||
400 | D: Configuration help text support | 400 | D: Configuration help text support |
401 | D: Linux CD and Support Giveaway List | 401 | D: Linux CD and Support Giveaway List |
402 | 402 | ||
403 | N: Erik Inge Bolsø | 403 | N: Erik Inge Bolsø |
404 | E: knan@mo.himolde.no | 404 | E: knan@mo.himolde.no |
405 | D: Misc kernel hacks | 405 | D: Misc kernel hacks |
406 | 406 | ||
@@ -428,7 +428,7 @@ D: Various fixes (mostly networking) | |||
428 | S: Montreal, Quebec | 428 | S: Montreal, Quebec |
429 | S: Canada | 429 | S: Canada |
430 | 430 | ||
431 | N: Zoltán Böszörményi | 431 | N: Zoltán Böszörményi |
432 | E: zboszor@mail.externet.hu | 432 | E: zboszor@mail.externet.hu |
433 | D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support | 433 | D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support |
434 | 434 | ||
@@ -1029,11 +1029,11 @@ D: Future Domain TMC-16x0 SCSI driver (author) | |||
1029 | D: APM driver (early port) | 1029 | D: APM driver (early port) |
1030 | D: DRM drivers (author of several) | 1030 | D: DRM drivers (author of several) |
1031 | 1031 | ||
1032 | N: János Farkas | 1032 | N: János Farkas |
1033 | E: chexum@shadow.banki.hu | 1033 | E: chexum@shadow.banki.hu |
1034 | D: romfs, various (mostly networking) fixes | 1034 | D: romfs, various (mostly networking) fixes |
1035 | P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71 6D 9C F3 9F F2 BF DF 6E | 1035 | P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71 6D 9C F3 9F F2 BF DF 6E |
1036 | S: Madarász Viktor utca 25 | 1036 | S: Madarász Viktor utca 25 |
1037 | S: 1131 Budapest | 1037 | S: 1131 Budapest |
1038 | S: Hungary | 1038 | S: Hungary |
1039 | 1039 | ||
@@ -1044,10 +1044,10 @@ D: UDF filesystem | |||
1044 | S: (ask for current address) | 1044 | S: (ask for current address) |
1045 | S: USA | 1045 | S: USA |
1046 | 1046 | ||
1047 | N: Jürgen Fischer | 1047 | N: Jürgen Fischer |
1048 | E: fischer@norbit.de (=?iso-8859-1?q?J=FCrgen?= Fischer) | 1048 | E: fischer@norbit.de |
1049 | D: Author of Adaptec AHA-152x SCSI driver | 1049 | D: Author of Adaptec AHA-152x SCSI driver |
1050 | S: Schulstraße 18 | 1050 | S: Schulstraße 18 |
1051 | S: 26506 Norden | 1051 | S: 26506 Norden |
1052 | S: Germany | 1052 | S: Germany |
1053 | 1053 | ||
@@ -1113,7 +1113,7 @@ E: fuganti@netbank.com.br | |||
1113 | D: random kernel hacker, ZF MachZ Watchdog driver | 1113 | D: random kernel hacker, ZF MachZ Watchdog driver |
1114 | S: Conectiva S.A. | 1114 | S: Conectiva S.A. |
1115 | S: R. Tocantins, 89 - Cristo Rei | 1115 | S: R. Tocantins, 89 - Cristo Rei |
1116 | S: 80050-430 - Curitiba - Paraná | 1116 | S: 80050-430 - Curitiba - Paraná |
1117 | S: Brazil | 1117 | S: Brazil |
1118 | 1118 | ||
1119 | N: Kumar Gala | 1119 | N: Kumar Gala |
@@ -1258,12 +1258,12 @@ S: 44 St. Joseph Street, Suite 506 | |||
1258 | S: Toronto, Ontario, M4Y 2W4 | 1258 | S: Toronto, Ontario, M4Y 2W4 |
1259 | S: Canada | 1259 | S: Canada |
1260 | 1260 | ||
1261 | N: Richard Günther | 1261 | N: Richard Günther |
1262 | E: rguenth@tat.physik.uni-tuebingen.de | 1262 | E: rguenth@tat.physik.uni-tuebingen.de |
1263 | W: http://www.tat.physik.uni-tuebingen.de/~rguenth | 1263 | W: http://www.tat.physik.uni-tuebingen.de/~rguenth |
1264 | P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57 | 1264 | P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57 |
1265 | D: binfmt_misc | 1265 | D: binfmt_misc |
1266 | S: 72074 Tübingen | 1266 | S: 72074 Tübingen |
1267 | S: Germany | 1267 | S: Germany |
1268 | 1268 | ||
1269 | N: Justin Guyett | 1269 | N: Justin Guyett |
@@ -1287,7 +1287,7 @@ N: Bruno Haible | |||
1287 | E: haible@ma2s2.mathematik.uni-karlsruhe.de | 1287 | E: haible@ma2s2.mathematik.uni-karlsruhe.de |
1288 | D: SysV FS, shm swapping, memory management fixes | 1288 | D: SysV FS, shm swapping, memory management fixes |
1289 | S: 17 rue Danton | 1289 | S: 17 rue Danton |
1290 | S: F - 94270 Le Kremlin-Bicêtre | 1290 | S: F - 94270 Le Kremlin-Bicêtre |
1291 | S: France | 1291 | S: France |
1292 | 1292 | ||
1293 | N: Greg Hankins | 1293 | N: Greg Hankins |
@@ -1701,7 +1701,7 @@ S: Czech Republic | |||
1701 | N: Jakob Kemi | 1701 | N: Jakob Kemi |
1702 | E: jakob.kemi@telia.com | 1702 | E: jakob.kemi@telia.com |
1703 | D: V4L W9966 Webcam driver | 1703 | D: V4L W9966 Webcam driver |
1704 | S: Forsbyvägen 33 | 1704 | S: Forsbyvägen 33 |
1705 | S: 74143 Knivsta | 1705 | S: 74143 Knivsta |
1706 | S: Sweden | 1706 | S: Sweden |
1707 | 1707 | ||
@@ -2065,7 +2065,7 @@ D: misc. kernel hacking and debugging | |||
2065 | S: Cambridge, MA 02139 | 2065 | S: Cambridge, MA 02139 |
2066 | S: USA | 2066 | S: USA |
2067 | 2067 | ||
2068 | N: Martin von Löwis | 2068 | N: Martin von Löwis |
2069 | E: loewis@informatik.hu-berlin.de | 2069 | E: loewis@informatik.hu-berlin.de |
2070 | D: script binary format | 2070 | D: script binary format |
2071 | D: NTFS driver | 2071 | D: NTFS driver |
@@ -2142,7 +2142,7 @@ S: PO BOX 220, HFX. CENTRAL | |||
2142 | S: Halifax, Nova Scotia | 2142 | S: Halifax, Nova Scotia |
2143 | S: Canada B3J 3C8 | 2143 | S: Canada B3J 3C8 |
2144 | 2144 | ||
2145 | N: Kai Mäkisara | 2145 | N: Kai Mäkisara |
2146 | E: Kai.Makisara@kolumbus.fi | 2146 | E: Kai.Makisara@kolumbus.fi |
2147 | D: SCSI Tape Driver | 2147 | D: SCSI Tape Driver |
2148 | 2148 | ||
@@ -2785,10 +2785,10 @@ N: Juan Quintela | |||
2785 | E: quintela@fi.udc.es | 2785 | E: quintela@fi.udc.es |
2786 | D: Memory Management hacking | 2786 | D: Memory Management hacking |
2787 | S: LFCIA | 2787 | S: LFCIA |
2788 | S: Departamento de Computación | 2788 | S: Departamento de Computación |
2789 | S: Universidade da Coruña | 2789 | S: Universidade da Coruña |
2790 | S: E-15071 | 2790 | S: E-15071 |
2791 | S: A Coruña | 2791 | S: A Coruña |
2792 | S: Spain | 2792 | S: Spain |
2793 | 2793 | ||
2794 | N: Augusto Cesar Radtke | 2794 | N: Augusto Cesar Radtke |
@@ -2939,7 +2939,7 @@ E: aris@cathedrallabs.org | |||
2939 | D: Support for EtherExpress 10 ISA (i82595) in eepro driver | 2939 | D: Support for EtherExpress 10 ISA (i82595) in eepro driver |
2940 | D: User level driver support for input | 2940 | D: User level driver support for input |
2941 | S: R. Jose Serrato, 130 - Santa Candida | 2941 | S: R. Jose Serrato, 130 - Santa Candida |
2942 | S: 82640-320 - Curitiba - Paraná | 2942 | S: 82640-320 - Curitiba - Paraná |
2943 | S: Brazil | 2943 | S: Brazil |
2944 | 2944 | ||
2945 | N: Alessandro Rubini | 2945 | N: Alessandro Rubini |
@@ -3345,15 +3345,15 @@ P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB | |||
3345 | D: rcutorture maintainer | 3345 | D: rcutorture maintainer |
3346 | D: lock annotations, finding and fixing lock bugs | 3346 | D: lock annotations, finding and fixing lock bugs |
3347 | 3347 | ||
3348 | N: Winfried Trümper | 3348 | N: Winfried Trümper |
3349 | E: winni@xpilot.org | 3349 | E: winni@xpilot.org |
3350 | W: http://www.shop.de/~winni/ | 3350 | W: http://www.shop.de/~winni/ |
3351 | D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages) | 3351 | D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages) |
3352 | D: CD-Writing HOWTO, various mini-HOWTOs | 3352 | D: CD-Writing HOWTO, various mini-HOWTOs |
3353 | D: One-week tutorials on Linux twice a year (free of charge) | 3353 | D: One-week tutorials on Linux twice a year (free of charge) |
3354 | D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests | 3354 | D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests |
3355 | S: Tacitusstr. 6 | 3355 | S: Tacitusstr. 6 |
3356 | S: D-50968 Köln | 3356 | S: D-50968 Köln |
3357 | 3357 | ||
3358 | N: Tsu-Sheng Tsao | 3358 | N: Tsu-Sheng Tsao |
3359 | E: tsusheng@scf.usc.edu | 3359 | E: tsusheng@scf.usc.edu |
diff --git a/Documentation/ABI/removed/devfs b/Documentation/ABI/removed/devfs index 8195c4e0d0a1..8ffd28bf6598 100644 --- a/Documentation/ABI/removed/devfs +++ b/Documentation/ABI/removed/devfs | |||
@@ -6,7 +6,7 @@ Description: | |||
6 | races, contains a naming policy within the kernel that is | 6 | races, contains a naming policy within the kernel that is |
7 | against the LSB, and can be replaced by using udev. | 7 | against the LSB, and can be replaced by using udev. |
8 | The files fs/devfs/*, include/linux/devfs_fs*.h were removed, | 8 | The files fs/devfs/*, include/linux/devfs_fs*.h were removed, |
9 | along with the the assorted devfs function calls throughout the | 9 | along with the assorted devfs function calls throughout the |
10 | kernel tree. | 10 | kernel tree. |
11 | 11 | ||
12 | Users: | 12 | Users: |
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index a2b2b4d187c5..38f88b6ae405 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -84,6 +84,10 @@ X!Iinclude/linux/kobject.h | |||
84 | !Ekernel/rcupdate.c | 84 | !Ekernel/rcupdate.c |
85 | </sect1> | 85 | </sect1> |
86 | 86 | ||
87 | <sect1><title>Device Resource Management</title> | ||
88 | !Edrivers/base/devres.c | ||
89 | </sect1> | ||
90 | |||
87 | </chapter> | 91 | </chapter> |
88 | 92 | ||
89 | <chapter id="adt"> | 93 | <chapter id="adt"> |
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt index d389388c733e..0d8240774fca 100644 --- a/Documentation/MSI-HOWTO.txt +++ b/Documentation/MSI-HOWTO.txt | |||
@@ -480,8 +480,8 @@ The PCI stack provides 3 possible levels of MSI disabling: | |||
480 | 480 | ||
481 | 6.1. Disabling MSI on a single device | 481 | 6.1. Disabling MSI on a single device |
482 | 482 | ||
483 | Under some circumstances, it might be required to disable MSI on a | 483 | Under some circumstances it might be required to disable MSI on a |
484 | single device, It may be achived by either not calling pci_enable_msi() | 484 | single device. This may be achieved by either not calling pci_enable_msi() |
485 | or all, or setting the pci_dev->no_msi flag before (most of the time | 485 | or all, or setting the pci_dev->no_msi flag before (most of the time |
486 | in a quirk). | 486 | in a quirk). |
487 | 487 | ||
@@ -492,7 +492,7 @@ being able to route MSI between busses. In this case, MSI have to be | |||
492 | disabled on all devices behind this bridge. It is achieves by setting | 492 | disabled on all devices behind this bridge. It is achieves by setting |
493 | the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge | 493 | the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge |
494 | subordinate bus. There is no need to set the same flag on bridges that | 494 | subordinate bus. There is no need to set the same flag on bridges that |
495 | are below the broken brigde. When pci_enable_msi() is called to enable | 495 | are below the broken bridge. When pci_enable_msi() is called to enable |
496 | MSI on a device, pci_msi_supported() takes care of checking the NO_MSI | 496 | MSI on a device, pci_msi_supported() takes care of checking the NO_MSI |
497 | flag in all parent busses of the device. | 497 | flag in all parent busses of the device. |
498 | 498 | ||
diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts index 72c93de8cd4e..0d3dbf1099bc 100644 --- a/Documentation/arm/Interrupts +++ b/Documentation/arm/Interrupts | |||
@@ -149,7 +149,7 @@ So, what's changed? | |||
149 | 149 | ||
150 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. | 150 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. |
151 | 151 | ||
152 | 4. Direct access to SA1111 INTPOL is depreciated. Use set_irq_type instead. | 152 | 4. Direct access to SA1111 INTPOL is deprecated. Use set_irq_type instead. |
153 | 153 | ||
154 | 5. A handler is expected to perform any necessary acknowledgement of the | 154 | 5. A handler is expected to perform any necessary acknowledgement of the |
155 | parent IRQ via the correct chip specific function. For instance, if | 155 | parent IRQ via the correct chip specific function. For instance, if |
diff --git a/Documentation/arm/Samsung-S3C24XX/H1940.txt b/Documentation/arm/Samsung-S3C24XX/H1940.txt index d6b1de92b111..f4a7b22c8664 100644 --- a/Documentation/arm/Samsung-S3C24XX/H1940.txt +++ b/Documentation/arm/Samsung-S3C24XX/H1940.txt | |||
@@ -23,7 +23,7 @@ Support | |||
23 | 23 | ||
24 | http://handhelds.org/moin/moin.cgi/HpIpaqH1940 | 24 | http://handhelds.org/moin/moin.cgi/HpIpaqH1940 |
25 | 25 | ||
26 | Herbert Pötzl pages: | 26 | Herbert Pötzl pages: |
27 | 27 | ||
28 | http://vserver.13thfloor.at/H1940/ | 28 | http://vserver.13thfloor.at/H1940/ |
29 | 29 | ||
@@ -32,7 +32,7 @@ Maintainers | |||
32 | ----------- | 32 | ----------- |
33 | 33 | ||
34 | This project is being maintained and developed by a variety | 34 | This project is being maintained and developed by a variety |
35 | of people, including Ben Dooks, Arnaud Patard, and Herbert Pötzl. | 35 | of people, including Ben Dooks, Arnaud Patard, and Herbert Pötzl. |
36 | 36 | ||
37 | Thanks to the many others who have also provided support. | 37 | Thanks to the many others who have also provided support. |
38 | 38 | ||
diff --git a/Documentation/auxdisplay/cfag12864b b/Documentation/auxdisplay/cfag12864b index 3572b98f45b8..b714183d4125 100644 --- a/Documentation/auxdisplay/cfag12864b +++ b/Documentation/auxdisplay/cfag12864b | |||
@@ -78,9 +78,9 @@ Select (17)------------------------------(16) Data / Instruction | |||
78 | Ground (18)---[GND] [+5v]---(19) LED + | 78 | Ground (18)---[GND] [+5v]---(19) LED + |
79 | Ground (19)---[GND] | 79 | Ground (19)---[GND] |
80 | Ground (20)---[GND] E A Values: | 80 | Ground (20)---[GND] E A Values: |
81 | Ground (21)---[GND] [GND]---[P1]---(18) Vee · R = Resistor = 22 ohm | 81 | Ground (21)---[GND] [GND]---[P1]---(18) Vee - R = Resistor = 22 ohm |
82 | Ground (22)---[GND] | · P1 = Preset = 10 Kohm | 82 | Ground (22)---[GND] | - P1 = Preset = 10 Kohm |
83 | Ground (23)---[GND] ---- S ------( 3) V0 · P2 = Preset = 1 Kohm | 83 | Ground (23)---[GND] ---- S ------( 3) V0 - P2 = Preset = 1 Kohm |
84 | Ground (24)---[GND] | | | 84 | Ground (24)---[GND] | | |
85 | Ground (25)---[GND] [GND]---[P2]---[R]---(20) LED - | 85 | Ground (25)---[GND] [GND]---[P2]---[R]---(20) LED - |
86 | 86 | ||
diff --git a/Documentation/binfmt_misc.txt b/Documentation/binfmt_misc.txt index d097f09ee15a..f609ebf9c78f 100644 --- a/Documentation/binfmt_misc.txt +++ b/Documentation/binfmt_misc.txt | |||
@@ -113,4 +113,4 @@ cause unexpected behaviour and can be a security hazard. | |||
113 | There is a web page about binfmt_misc at | 113 | There is a web page about binfmt_misc at |
114 | http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html | 114 | http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html |
115 | 115 | ||
116 | Richard Günther <rguenth@tat.physik.uni-tuebingen.de> | 116 | Richard Günther <rguenth@tat.physik.uni-tuebingen.de> |
diff --git a/Documentation/block/ioprio.txt b/Documentation/block/ioprio.txt index 96ccf681075e..1b930ef5a079 100644 --- a/Documentation/block/ioprio.txt +++ b/Documentation/block/ioprio.txt | |||
@@ -6,10 +6,10 @@ Intro | |||
6 | ----- | 6 | ----- |
7 | 7 | ||
8 | With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io | 8 | With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io |
9 | priorities is supported for reads on files. This enables users to io nice | 9 | priorities are supported for reads on files. This enables users to io nice |
10 | processes or process groups, similar to what has been possible to cpu | 10 | processes or process groups, similar to what has been possible with cpu |
11 | scheduling for ages. This document mainly details the current possibilites | 11 | scheduling for ages. This document mainly details the current possibilities |
12 | with cfq, other io schedulers do not support io priorities so far. | 12 | with cfq; other io schedulers do not support io priorities thus far. |
13 | 13 | ||
14 | Scheduling classes | 14 | Scheduling classes |
15 | ------------------ | 15 | ------------------ |
diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt index 53d62c1e1c94..fc647492e940 100644 --- a/Documentation/cpu-freq/cpufreq-stats.txt +++ b/Documentation/cpu-freq/cpufreq-stats.txt | |||
@@ -17,7 +17,7 @@ Contents | |||
17 | 17 | ||
18 | 1. Introduction | 18 | 1. Introduction |
19 | 19 | ||
20 | cpufreq-stats is a driver that provices CPU frequency statistics for each CPU. | 20 | cpufreq-stats is a driver that provides CPU frequency statistics for each CPU. |
21 | These statistics are provided in /sysfs as a bunch of read_only interfaces. This | 21 | These statistics are provided in /sysfs as a bunch of read_only interfaces. This |
22 | interface (when configured) will appear in a separate directory under cpufreq | 22 | interface (when configured) will appear in a separate directory under cpufreq |
23 | in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU. | 23 | in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU. |
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt index 9b84b805ab75..a2ac6d294793 100644 --- a/Documentation/crypto/api-intro.txt +++ b/Documentation/crypto/api-intro.txt | |||
@@ -177,7 +177,7 @@ Portions of this API were derived from the following projects: | |||
177 | and; | 177 | and; |
178 | 178 | ||
179 | Nettle (http://www.lysator.liu.se/~nisse/nettle/) | 179 | Nettle (http://www.lysator.liu.se/~nisse/nettle/) |
180 | Niels Möller | 180 | Niels Möller |
181 | 181 | ||
182 | Original developers of the crypto algorithms: | 182 | Original developers of the crypto algorithms: |
183 | 183 | ||
@@ -200,8 +200,8 @@ SHA1 algorithm contributors: | |||
200 | 200 | ||
201 | DES algorithm contributors: | 201 | DES algorithm contributors: |
202 | Raimar Falke | 202 | Raimar Falke |
203 | Gisle Sælensminde | 203 | Gisle Sælensminde |
204 | Niels Möller | 204 | Niels Möller |
205 | 205 | ||
206 | Blowfish algorithm contributors: | 206 | Blowfish algorithm contributors: |
207 | Herbert Valerio Riedel | 207 | Herbert Valerio Riedel |
diff --git a/Documentation/driver-model/platform.txt b/Documentation/driver-model/platform.txt index f7c9262b2dc8..19c4a6e13676 100644 --- a/Documentation/driver-model/platform.txt +++ b/Documentation/driver-model/platform.txt | |||
@@ -16,7 +16,7 @@ host bridges to peripheral buses, and most controllers integrated | |||
16 | into system-on-chip platforms. What they usually have in common | 16 | into system-on-chip platforms. What they usually have in common |
17 | is direct addressing from a CPU bus. Rarely, a platform_device will | 17 | is direct addressing from a CPU bus. Rarely, a platform_device will |
18 | be connected through a segment of some other kind of bus; but its | 18 | be connected through a segment of some other kind of bus; but its |
19 | registers will still be directly addressible. | 19 | registers will still be directly addressable. |
20 | 20 | ||
21 | Platform devices are given a name, used in driver binding, and a | 21 | Platform devices are given a name, used in driver binding, and a |
22 | list of resources such as addresses and IRQs. | 22 | list of resources such as addresses and IRQs. |
@@ -125,7 +125,7 @@ three different ways to find such a match: | |||
125 | usually register later during booting, or by module loading. | 125 | usually register later during booting, or by module loading. |
126 | 126 | ||
127 | - Registering a driver using platform_driver_probe() works just like | 127 | - Registering a driver using platform_driver_probe() works just like |
128 | using platform_driver_register(), except that the the driver won't | 128 | using platform_driver_register(), except that the driver won't |
129 | be probed later if another device registers. (Which is OK, since | 129 | be probed later if another device registers. (Which is OK, since |
130 | this interface is only for use with non-hotpluggable devices.) | 130 | this interface is only for use with non-hotpluggable devices.) |
131 | 131 | ||
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index 46b78b7331c2..bf2a9cdfe7bb 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
@@ -228,5 +228,5 @@ Patches, comments and suggestions are very very welcome. | |||
228 | 228 | ||
229 | Ulf Hermenau for helping me out with traditional chinese. | 229 | Ulf Hermenau for helping me out with traditional chinese. |
230 | 230 | ||
231 | André Smoktun and Christian Frömmel for supporting me with | 231 | André Smoktun and Christian Frömmel for supporting me with |
232 | hardware and listening to my problems very patiently. | 232 | hardware and listening to my problems very patiently. |
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt index 4c33cced5f65..4865addebe1c 100644 --- a/Documentation/dvb/contributors.txt +++ b/Documentation/dvb/contributors.txt | |||
@@ -66,7 +66,7 @@ Michael Dreher <michael@5dot1.de> | |||
66 | Andreas 'randy' Weinberger | 66 | Andreas 'randy' Weinberger |
67 | for the support of the Fujitsu-Siemens Activy budget DVB-S | 67 | for the support of the Fujitsu-Siemens Activy budget DVB-S |
68 | 68 | ||
69 | Kenneth Aafløy <ke-aa@frisurf.no> | 69 | Kenneth Aafløy <ke-aa@frisurf.no> |
70 | for adding support for Typhoon DVB-S budget card | 70 | for adding support for Typhoon DVB-S budget card |
71 | 71 | ||
72 | Ernst Peinlich <e.peinlich@inode.at> | 72 | Ernst Peinlich <e.peinlich@inode.at> |
diff --git a/Documentation/fb/aty128fb.txt b/Documentation/fb/aty128fb.txt index 069262fb619d..b605204fcfe1 100644 --- a/Documentation/fb/aty128fb.txt +++ b/Documentation/fb/aty128fb.txt | |||
@@ -54,8 +54,8 @@ Accepted options: | |||
54 | 54 | ||
55 | noaccel - do not use acceleration engine. It is default. | 55 | noaccel - do not use acceleration engine. It is default. |
56 | accel - use acceleration engine. Not finished. | 56 | accel - use acceleration engine. Not finished. |
57 | vmode:x - chooses PowerMacintosh video mode <x>. Depreciated. | 57 | vmode:x - chooses PowerMacintosh video mode <x>. Deprecated. |
58 | cmode:x - chooses PowerMacintosh colour mode <x>. Depreciated. | 58 | cmode:x - chooses PowerMacintosh colour mode <x>. Deprecated. |
59 | <XxX@X> - selects startup videomode. See modedb.txt for detailed | 59 | <XxX@X> - selects startup videomode. See modedb.txt for detailed |
60 | explanation. Default is 640x480x8bpp. | 60 | explanation. Default is 640x480x8bpp. |
61 | 61 | ||
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt index 610e7801207b..b3e3a0356839 100644 --- a/Documentation/fb/framebuffer.txt +++ b/Documentation/fb/framebuffer.txt | |||
@@ -215,11 +215,11 @@ vertical retrace time is the sum of the upper margin, the lower margin and the | |||
215 | vsync length. | 215 | vsync length. |
216 | 216 | ||
217 | +----------+---------------------------------------------+----------+-------+ | 217 | +----------+---------------------------------------------+----------+-------+ |
218 | | | ^ | | | | 218 | | | ↑ | | | |
219 | | | |upper_margin | | | | 219 | | | |upper_margin | | | |
220 | | | ¥ | | | | 220 | | | ↓ | | | |
221 | +----------###############################################----------+-------+ | 221 | +----------###############################################----------+-------+ |
222 | | # ^ # | | | 222 | | # ↑ # | | |
223 | | # | # | | | 223 | | # | # | | |
224 | | # | # | | | 224 | | # | # | | |
225 | | # | # | | | 225 | | # | # | | |
@@ -238,15 +238,15 @@ vsync length. | |||
238 | | # | # | | | 238 | | # | # | | |
239 | | # | # | | | 239 | | # | # | | |
240 | | # | # | | | 240 | | # | # | | |
241 | | # ¥ # | | | 241 | | # ↓ # | | |
242 | +----------###############################################----------+-------+ | 242 | +----------###############################################----------+-------+ |
243 | | | ^ | | | | 243 | | | ↑ | | | |
244 | | | |lower_margin | | | | 244 | | | |lower_margin | | | |
245 | | | ¥ | | | | 245 | | | ↓ | | | |
246 | +----------+---------------------------------------------+----------+-------+ | 246 | +----------+---------------------------------------------+----------+-------+ |
247 | | | ^ | | | | 247 | | | ↑ | | | |
248 | | | |vsync_len | | | | 248 | | | |vsync_len | | | |
249 | | | ¥ | | | | 249 | | | ↓ | | | |
250 | +----------+---------------------------------------------+----------+-------+ | 250 | +----------+---------------------------------------------+----------+-------+ |
251 | 251 | ||
252 | The frame buffer device expects all horizontal timings in number of dotclocks | 252 | The frame buffer device expects all horizontal timings in number of dotclocks |
diff --git a/Documentation/fb/imacfb.txt b/Documentation/fb/imacfb.txt index 759028545a7e..316ec9bb7deb 100644 --- a/Documentation/fb/imacfb.txt +++ b/Documentation/fb/imacfb.txt | |||
@@ -17,7 +17,7 @@ How to use it? | |||
17 | ============== | 17 | ============== |
18 | 18 | ||
19 | Imacfb does not have any kind of autodetection of your machine. | 19 | Imacfb does not have any kind of autodetection of your machine. |
20 | You have to add the fillowing kernel parameters in your elilo.conf: | 20 | You have to add the following kernel parameters in your elilo.conf: |
21 | Macbook : | 21 | Macbook : |
22 | video=imacfb:macbook | 22 | video=imacfb:macbook |
23 | MacMini : | 23 | MacMini : |
diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt index df27f5bf15db..550ca775a4cb 100644 --- a/Documentation/fb/sstfb.txt +++ b/Documentation/fb/sstfb.txt | |||
@@ -2,9 +2,9 @@ | |||
2 | Introduction | 2 | Introduction |
3 | 3 | ||
4 | This is a frame buffer device driver for 3dfx' Voodoo Graphics | 4 | This is a frame buffer device driver for 3dfx' Voodoo Graphics |
5 | (aka voodoo 1, aka sst1) and Voodoo² (aka Voodoo 2, aka CVG) based | 5 | (aka voodoo 1, aka sst1) and Voodoo² (aka Voodoo 2, aka CVG) based |
6 | video boards. It's highly experimental code, but is guaranteed to work | 6 | video boards. It's highly experimental code, but is guaranteed to work |
7 | on my computer, with my "Maxi Gamer 3D" and "Maxi Gamer 3d²" boards, | 7 | on my computer, with my "Maxi Gamer 3D" and "Maxi Gamer 3d²" boards, |
8 | and with me "between chair and keyboard". Some people tested other | 8 | and with me "between chair and keyboard". Some people tested other |
9 | combinations and it seems that it works. | 9 | combinations and it seems that it works. |
10 | The main page is located at <http://sstfb.sourceforge.net>, and if | 10 | The main page is located at <http://sstfb.sourceforge.net>, and if |
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 59c14159cc47..d866551be037 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -54,7 +54,7 @@ ata *); | |||
54 | 54 | ||
55 | locking rules: | 55 | locking rules: |
56 | all may block, none have BKL | 56 | all may block, none have BKL |
57 | i_sem(inode) | 57 | i_mutex(inode) |
58 | lookup: yes | 58 | lookup: yes |
59 | create: yes | 59 | create: yes |
60 | link: yes (both) | 60 | link: yes (both) |
@@ -74,7 +74,7 @@ setxattr: yes | |||
74 | getxattr: no | 74 | getxattr: no |
75 | listxattr: no | 75 | listxattr: no |
76 | removexattr: yes | 76 | removexattr: yes |
77 | Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_sem on | 77 | Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on |
78 | victim. | 78 | victim. |
79 | cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem. | 79 | cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem. |
80 | ->truncate() is never called directly - it's a callback, not a | 80 | ->truncate() is never called directly - it's a callback, not a |
@@ -461,7 +461,7 @@ doesn't take the BKL. | |||
461 | ->read on directories probably must go away - we should just enforce -EISDIR | 461 | ->read on directories probably must go away - we should just enforce -EISDIR |
462 | in sys_read() and friends. | 462 | in sys_read() and friends. |
463 | 463 | ||
464 | ->fsync() has i_sem on inode. | 464 | ->fsync() has i_mutex on inode. |
465 | 465 | ||
466 | --------------------------- dquot_operations ------------------------------- | 466 | --------------------------- dquot_operations ------------------------------- |
467 | prototypes: | 467 | prototypes: |
diff --git a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt index 38aba03efc5e..fa45c3baed98 100644 --- a/Documentation/filesystems/hpfs.txt +++ b/Documentation/filesystems/hpfs.txt | |||
@@ -290,7 +290,7 @@ History | |||
290 | 2.07 More fixes for Warp Server. Now it really works | 290 | 2.07 More fixes for Warp Server. Now it really works |
291 | 2.08 Creating new files is not so slow on large disks | 291 | 2.08 Creating new files is not so slow on large disks |
292 | An attempt to sync deleted file does not generate filesystem error | 292 | An attempt to sync deleted file does not generate filesystem error |
293 | 2.09 Fixed error on extremly fragmented files | 293 | 2.09 Fixed error on extremely fragmented files |
294 | 294 | ||
295 | 295 | ||
296 | vim: set textwidth=80: | 296 | vim: set textwidth=80: |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 81779068b09b..8ee10ec88293 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
@@ -349,7 +349,7 @@ end of the line. | |||
349 | Note the "Should sync?" parameter "nosync" means that the two mirrors are | 349 | Note the "Should sync?" parameter "nosync" means that the two mirrors are |
350 | already in sync which will be the case on a clean shutdown of Windows. If the | 350 | already in sync which will be the case on a clean shutdown of Windows. If the |
351 | mirrors are not clean, you can specify the "sync" option instead of "nosync" | 351 | mirrors are not clean, you can specify the "sync" option instead of "nosync" |
352 | and the Device-Mapper driver will then copy the entirey of the "Source Device" | 352 | and the Device-Mapper driver will then copy the entirety of the "Source Device" |
353 | to the "Target Device" or if you specified multipled target devices to all of | 353 | to the "Target Device" or if you specified multipled target devices to all of |
354 | them. | 354 | them. |
355 | 355 | ||
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 4f3e84c520a5..8756a07f4dc3 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -229,7 +229,7 @@ Table 1-3: Kernel info in /proc | |||
229 | mounts Mounted filesystems | 229 | mounts Mounted filesystems |
230 | net Networking info (see text) | 230 | net Networking info (see text) |
231 | partitions Table of partitions known to the system | 231 | partitions Table of partitions known to the system |
232 | pci Depreciated info of PCI bus (new way -> /proc/bus/pci/, | 232 | pci Deprecated info of PCI bus (new way -> /proc/bus/pci/, |
233 | decoupled by lspci (2.4) | 233 | decoupled by lspci (2.4) |
234 | rtc Real time clock | 234 | rtc Real time clock |
235 | scsi SCSI info (see text) | 235 | scsi SCSI info (see text) |
diff --git a/Documentation/filesystems/relay.txt b/Documentation/filesystems/relay.txt index 7fbb6ffe5769..18d23f9a18c7 100644 --- a/Documentation/filesystems/relay.txt +++ b/Documentation/filesystems/relay.txt | |||
@@ -351,7 +351,7 @@ If the current buffer is full, i.e. all sub-buffers remain unconsumed, | |||
351 | the callback returns 0 to indicate that the buffer switch should not | 351 | the callback returns 0 to indicate that the buffer switch should not |
352 | occur yet, i.e. until the consumer has had a chance to read the | 352 | occur yet, i.e. until the consumer has had a chance to read the |
353 | current set of ready sub-buffers. For the relay_buf_full() function | 353 | current set of ready sub-buffers. For the relay_buf_full() function |
354 | to make sense, the consumer is reponsible for notifying the relay | 354 | to make sense, the consumer is responsible for notifying the relay |
355 | interface when sub-buffers have been consumed via | 355 | interface when sub-buffers have been consumed via |
356 | relay_subbufs_consumed(). Any subsequent attempts to write into the | 356 | relay_subbufs_consumed(). Any subsequent attempts to write into the |
357 | buffer will again invoke the subbuf_start() callback with the same | 357 | buffer will again invoke the subbuf_start() callback with the same |
diff --git a/Documentation/filesystems/xip.txt b/Documentation/filesystems/xip.txt index 6c0cef10eb4d..3cc4010521a0 100644 --- a/Documentation/filesystems/xip.txt +++ b/Documentation/filesystems/xip.txt | |||
@@ -19,7 +19,7 @@ completely. With execute-in-place, read&write type operations are performed | |||
19 | directly from/to the memory backed storage device. For file mappings, the | 19 | directly from/to the memory backed storage device. For file mappings, the |
20 | storage device itself is mapped directly into userspace. | 20 | storage device itself is mapped directly into userspace. |
21 | 21 | ||
22 | This implementation was initialy written for shared memory segments between | 22 | This implementation was initially written for shared memory segments between |
23 | different virtual machines on s390 hardware to allow multiple machines to | 23 | different virtual machines on s390 hardware to allow multiple machines to |
24 | share the same binaries and libraries. | 24 | share the same binaries and libraries. |
25 | 25 | ||
diff --git a/Documentation/fujitsu/frv/gdbstub.txt b/Documentation/fujitsu/frv/gdbstub.txt index 9304fb36ae8a..b92bfd902a4e 100644 --- a/Documentation/fujitsu/frv/gdbstub.txt +++ b/Documentation/fujitsu/frv/gdbstub.txt | |||
@@ -126,5 +126,5 @@ GDB stub and the debugger: | |||
126 | 126 | ||
127 | Furthermore, the GDB stub will intercept a number of exceptions automatically | 127 | Furthermore, the GDB stub will intercept a number of exceptions automatically |
128 | if they are caused by kernel execution. It will also intercept BUG() macro | 128 | if they are caused by kernel execution. It will also intercept BUG() macro |
129 | invokation. | 129 | invocation. |
130 | 130 | ||
diff --git a/Documentation/hwmon/adm1026 b/Documentation/hwmon/adm1026 index 473c689d7924..f4327db2307e 100644 --- a/Documentation/hwmon/adm1026 +++ b/Documentation/hwmon/adm1026 | |||
@@ -80,7 +80,7 @@ temperature sensor inputs. Both the PWM output and the DAC output can be | |||
80 | used to control fan speed. Usually only one of these two outputs will be | 80 | used to control fan speed. Usually only one of these two outputs will be |
81 | used. Write the minimum PWM or DAC value to the appropriate control | 81 | used. Write the minimum PWM or DAC value to the appropriate control |
82 | register. Then set the low temperature limit in the tmin values for each | 82 | register. Then set the low temperature limit in the tmin values for each |
83 | temperature sensor. The range of control is fixed at 20 °C, and the | 83 | temperature sensor. The range of control is fixed at 20 °C, and the |
84 | largest difference between current and tmin of the temperature sensors sets | 84 | largest difference between current and tmin of the temperature sensors sets |
85 | the control output. See the datasheet for several example circuits for | 85 | the control output. See the datasheet for several example circuits for |
86 | controlling fan speed with the PWM and DAC outputs. The fan speed sensors | 86 | controlling fan speed with the PWM and DAC outputs. The fan speed sensors |
diff --git a/Documentation/hwmon/gl518sm b/Documentation/hwmon/gl518sm index ce0881883bca..229f8b789185 100644 --- a/Documentation/hwmon/gl518sm +++ b/Documentation/hwmon/gl518sm | |||
@@ -13,7 +13,7 @@ Supported chips: | |||
13 | 13 | ||
14 | Authors: | 14 | Authors: |
15 | Frodo Looijaard <frodol@dds.nl>, | 15 | Frodo Looijaard <frodol@dds.nl>, |
16 | Kyösti Mälkki <kmalkki@cc.hut.fi> | 16 | Kyösti Mälkki <kmalkki@cc.hut.fi> |
17 | Hong-Gunn Chew <hglinux@gunnet.org> | 17 | Hong-Gunn Chew <hglinux@gunnet.org> |
18 | Jean Delvare <khali@linux-fr.org> | 18 | Jean Delvare <khali@linux-fr.org> |
19 | 19 | ||
diff --git a/Documentation/hwmon/lm83 b/Documentation/hwmon/lm83 index f7aad1489cb0..a04d1fe9269c 100644 --- a/Documentation/hwmon/lm83 +++ b/Documentation/hwmon/lm83 | |||
@@ -45,7 +45,7 @@ Unconfirmed motherboards: | |||
45 | The LM82 is confirmed to have been found on most AMD Geode reference | 45 | The LM82 is confirmed to have been found on most AMD Geode reference |
46 | designs and test platforms. | 46 | designs and test platforms. |
47 | 47 | ||
48 | The driver has been successfully tested by Magnus Forsström, who I'd | 48 | The driver has been successfully tested by Magnus Forsström, who I'd |
49 | like to thank here. More testers will be of course welcome. | 49 | like to thank here. More testers will be of course welcome. |
50 | 50 | ||
51 | The fact that the LM83 is only scarcely used can be easily explained. | 51 | The fact that the LM83 is only scarcely used can be easily explained. |
diff --git a/Documentation/hwmon/sis5595 b/Documentation/hwmon/sis5595 index b7ae36b8cdf5..4f8877a34f37 100644 --- a/Documentation/hwmon/sis5595 +++ b/Documentation/hwmon/sis5595 | |||
@@ -8,7 +8,7 @@ Supported chips: | |||
8 | Datasheet: Publicly available at the Silicon Integrated Systems Corp. site. | 8 | Datasheet: Publicly available at the Silicon Integrated Systems Corp. site. |
9 | 9 | ||
10 | Authors: | 10 | Authors: |
11 | Kyösti Mälkki <kmalkki@cc.hut.fi>, | 11 | Kyösti Mälkki <kmalkki@cc.hut.fi>, |
12 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 12 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
13 | Aurelien Jarno <aurelien@aurel32.net> 2.6 port | 13 | Aurelien Jarno <aurelien@aurel32.net> 2.6 port |
14 | 14 | ||
diff --git a/Documentation/hwmon/via686a b/Documentation/hwmon/via686a index a936fb3824b2..d651b25f7519 100644 --- a/Documentation/hwmon/via686a +++ b/Documentation/hwmon/via686a | |||
@@ -8,7 +8,7 @@ Supported chips: | |||
8 | Datasheet: On request through web form (http://www.via.com.tw/en/support/datasheets/) | 8 | Datasheet: On request through web form (http://www.via.com.tw/en/support/datasheets/) |
9 | 9 | ||
10 | Authors: | 10 | Authors: |
11 | Kyösti Mälkki <kmalkki@cc.hut.fi>, | 11 | Kyösti Mälkki <kmalkki@cc.hut.fi>, |
12 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 12 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
13 | Bob Dougherty <bobd@stanford.edu> | 13 | Bob Dougherty <bobd@stanford.edu> |
14 | (Some conversion-factor data were contributed by | 14 | (Some conversion-factor data were contributed by |
diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d index 8171c285bb55..14a668ed8aaa 100644 --- a/Documentation/hwmon/w83792d +++ b/Documentation/hwmon/w83792d | |||
@@ -107,7 +107,7 @@ Known problems: | |||
107 | by CR[0x49h]. | 107 | by CR[0x49h]. |
108 | - The function of vid and vrm has not been finished, because I'm NOT | 108 | - The function of vid and vrm has not been finished, because I'm NOT |
109 | very familiar with them. Adding support is welcome. | 109 | very familiar with them. Adding support is welcome. |
110 | - The function of chassis open detection needs more tests. | 110 | Â - The function of chassis open detection needs more tests. |
111 | - If you have ASUS server board and chip was not found: Then you will | 111 | - If you have ASUS server board and chip was not found: Then you will |
112 | need to upgrade to latest (or beta) BIOS. If it does not help please | 112 | need to upgrade to latest (or beta) BIOS. If it does not help please |
113 | contact us. | 113 | contact us. |
diff --git a/Documentation/i2c/busses/i2c-i810 b/Documentation/i2c/busses/i2c-i810 index 83c3b9743c3c..778210ee1583 100644 --- a/Documentation/i2c/busses/i2c-i810 +++ b/Documentation/i2c/busses/i2c-i810 | |||
@@ -7,7 +7,7 @@ Supported adapters: | |||
7 | Authors: | 7 | Authors: |
8 | Frodo Looijaard <frodol@dds.nl>, | 8 | Frodo Looijaard <frodol@dds.nl>, |
9 | Philip Edelbrock <phil@netroedge.com>, | 9 | Philip Edelbrock <phil@netroedge.com>, |
10 | Kyösti Mälkki <kmalkki@cc.hut.fi>, | 10 | Kyösti Mälkki <kmalkki@cc.hut.fi>, |
11 | Ralph Metzler <rjkm@thp.uni-koeln.de>, | 11 | Ralph Metzler <rjkm@thp.uni-koeln.de>, |
12 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 12 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
13 | 13 | ||
diff --git a/Documentation/i2c/busses/i2c-sis96x b/Documentation/i2c/busses/i2c-sis96x index 08d7b2dac69a..266481fd26e2 100644 --- a/Documentation/i2c/busses/i2c-sis96x +++ b/Documentation/i2c/busses/i2c-sis96x | |||
@@ -60,7 +60,7 @@ Mark D. Studebaker <mdsxyz123@yahoo.com> | |||
60 | - design hints and bug fixes | 60 | - design hints and bug fixes |
61 | Alexander Maylsh <amalysh@web.de> | 61 | Alexander Maylsh <amalysh@web.de> |
62 | - ditto, plus an important datasheet... almost the one I really wanted | 62 | - ditto, plus an important datasheet... almost the one I really wanted |
63 | Hans-Günter Lütke Uphues <hg_lu@t-online.de> | 63 | Hans-Günter Lütke Uphues <hg_lu@t-online.de> |
64 | - patch for SiS735 | 64 | - patch for SiS735 |
65 | Robert Zwerus <arzie@dds.nl> | 65 | Robert Zwerus <arzie@dds.nl> |
66 | - testing for SiS645DX | 66 | - testing for SiS645DX |
diff --git a/Documentation/i2c/busses/i2c-via b/Documentation/i2c/busses/i2c-via index 55edfe1a640b..343870661ac3 100644 --- a/Documentation/i2c/busses/i2c-via +++ b/Documentation/i2c/busses/i2c-via | |||
@@ -4,7 +4,7 @@ Supported adapters: | |||
4 | * VIA Technologies, InC. VT82C586B | 4 | * VIA Technologies, InC. VT82C586B |
5 | Datasheet: Publicly available at the VIA website | 5 | Datasheet: Publicly available at the VIA website |
6 | 6 | ||
7 | Author: Kyösti Mälkki <kmalkki@cc.hut.fi> | 7 | Author: Kyösti Mälkki <kmalkki@cc.hut.fi> |
8 | 8 | ||
9 | Description | 9 | Description |
10 | ----------- | 10 | ----------- |
diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro index 775f489e86f6..06b4be3ef6d8 100644 --- a/Documentation/i2c/busses/i2c-viapro +++ b/Documentation/i2c/busses/i2c-viapro | |||
@@ -17,7 +17,7 @@ Supported adapters: | |||
17 | Datasheet: available on request and under NDA from VIA | 17 | Datasheet: available on request and under NDA from VIA |
18 | 18 | ||
19 | Authors: | 19 | Authors: |
20 | Kyösti Mälkki <kmalkki@cc.hut.fi>, | 20 | Kyösti Mälkki <kmalkki@cc.hut.fi>, |
21 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 21 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
22 | Jean Delvare <khali@linux-fr.org> | 22 | Jean Delvare <khali@linux-fr.org> |
23 | 23 | ||
diff --git a/Documentation/i2c/i2c-protocol b/Documentation/i2c/i2c-protocol index b4022c914210..579b92d5f3a3 100644 --- a/Documentation/i2c/i2c-protocol +++ b/Documentation/i2c/i2c-protocol | |||
@@ -68,7 +68,7 @@ We have found some I2C devices that needs the following modifications: | |||
68 | 68 | ||
69 | Flags I2C_M_IGNORE_NAK | 69 | Flags I2C_M_IGNORE_NAK |
70 | Normally message is interrupted immediately if there is [NA] from the | 70 | Normally message is interrupted immediately if there is [NA] from the |
71 | client. Setting this flag treats any [NA] as [A], and all of | 71 | client. Setting this flag treats any [NA] as [A], and all of |
72 | message is sent. | 72 | message is sent. |
73 | These messages may still fail to SCL lo->hi timeout. | 73 | These messages may still fail to SCL lo->hi timeout. |
74 | 74 | ||
diff --git a/Documentation/i2o/README b/Documentation/i2o/README index 9aa6ddb446eb..0ebf58c73f54 100644 --- a/Documentation/i2o/README +++ b/Documentation/i2o/README | |||
@@ -30,13 +30,13 @@ Juha Sievanen, University of Helsinki Finland | |||
30 | Bug fixes | 30 | Bug fixes |
31 | Core code extensions | 31 | Core code extensions |
32 | 32 | ||
33 | Auvo Häkkinen, University of Helsinki Finland | 33 | Auvo Häkkinen, University of Helsinki Finland |
34 | LAN OSM code | 34 | LAN OSM code |
35 | /Proc interface to LAN class | 35 | /Proc interface to LAN class |
36 | Bug fixes | 36 | Bug fixes |
37 | Core code extensions | 37 | Core code extensions |
38 | 38 | ||
39 | Taneli Vähäkangas, University of Helsinki Finland | 39 | Taneli Vähäkangas, University of Helsinki Finland |
40 | Fixes to i2o_config | 40 | Fixes to i2o_config |
41 | 41 | ||
42 | CREDITS | 42 | CREDITS |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index 668f4d0d97d6..ab050621e20f 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt | |||
@@ -179,9 +179,9 @@ reporting mode for joystick 1, with both buttons being logically assigned to | |||
179 | the mouse. After any joystick command, the ikbd assumes that joysticks are | 179 | the mouse. After any joystick command, the ikbd assumes that joysticks are |
180 | connected to both Joystick0 and Joystick1. Any mouse command (except MOUSE | 180 | connected to both Joystick0 and Joystick1. Any mouse command (except MOUSE |
181 | DISABLE) then causes port 0 to again be scanned as if it were a mouse, and | 181 | DISABLE) then causes port 0 to again be scanned as if it were a mouse, and |
182 | both buttons are logically connected to it. If a mouse diable command is | 182 | both buttons are logically connected to it. If a mouse disable command is |
183 | received while port 0 is presumed to be a mouse, the button is logically | 183 | received while port 0 is presumed to be a mouse, the button is logically |
184 | assigned to Joystick1 ( until the mouse is reenabled by another mouse command). | 184 | assigned to Joystick1 (until the mouse is reenabled by another mouse command). |
185 | 185 | ||
186 | 9. ikbd Command Set | 186 | 9. ikbd Command Set |
187 | 187 | ||
diff --git a/Documentation/input/xpad.txt b/Documentation/input/xpad.txt index 5427bdf225ed..aae0d404c566 100644 --- a/Documentation/input/xpad.txt +++ b/Documentation/input/xpad.txt | |||
@@ -65,15 +65,15 @@ of buttons, see section 0.3 - Unknown Controllers | |||
65 | I've tested this with Stepmania, and it works quite well. | 65 | I've tested this with Stepmania, and it works quite well. |
66 | 66 | ||
67 | 67 | ||
68 | 0.3 Unkown Controllers | 68 | 0.3 Unknown Controllers |
69 | ---------------------- | 69 | ---------------------- |
70 | If you have an unkown xbox controller, it should work just fine with | 70 | If you have an unknown xbox controller, it should work just fine with |
71 | the default settings. | 71 | the default settings. |
72 | 72 | ||
73 | HOWEVER if you have an unknown dance pad not listed below, it will not | 73 | HOWEVER if you have an unknown dance pad not listed below, it will not |
74 | work UNLESS you set "dpad_to_buttons" to 1 in the module configuration. | 74 | work UNLESS you set "dpad_to_buttons" to 1 in the module configuration. |
75 | 75 | ||
76 | PLEASE if you have an unkown controller, email Dom <binary1230@yahoo.com> with | 76 | PLEASE, if you have an unknown controller, email Dom <binary1230@yahoo.com> with |
77 | a dump from /proc/bus/usb and a description of the pad (manufacturer, country, | 77 | a dump from /proc/bus/usb and a description of the pad (manufacturer, country, |
78 | whether it is a dance pad or normal controller) so that we can add your pad | 78 | whether it is a dance pad or normal controller) so that we can add your pad |
79 | to the list of supported devices, ensuring that it will work out of the | 79 | to the list of supported devices, ensuring that it will work out of the |
diff --git a/Documentation/isdn/CREDITS b/Documentation/isdn/CREDITS index e1b3023efaa8..7c17c837064f 100644 --- a/Documentation/isdn/CREDITS +++ b/Documentation/isdn/CREDITS | |||
@@ -2,7 +2,7 @@ | |||
2 | I want to thank all who contributed to this project and especially to: | 2 | I want to thank all who contributed to this project and especially to: |
3 | (in alphabetical order) | 3 | (in alphabetical order) |
4 | 4 | ||
5 | Thomas Bogendörfer (tsbogend@bigbug.franken.de) | 5 | Thomas Bogendörfer (tsbogend@bigbug.franken.de) |
6 | Tester, lots of bugfixes and hints. | 6 | Tester, lots of bugfixes and hints. |
7 | 7 | ||
8 | Alan Cox (alan@redhat.com) | 8 | Alan Cox (alan@redhat.com) |
@@ -11,7 +11,7 @@ Alan Cox (alan@redhat.com) | |||
11 | Henner Eisen (eis@baty.hanse.de) | 11 | Henner Eisen (eis@baty.hanse.de) |
12 | For X.25 implementation. | 12 | For X.25 implementation. |
13 | 13 | ||
14 | Volker Götz (volker@oops.franken.de) | 14 | Volker Götz (volker@oops.franken.de) |
15 | For contribution of man-pages, the imontty-tool and a perfect | 15 | For contribution of man-pages, the imontty-tool and a perfect |
16 | maintaining of the mailing-list at hub-wue. | 16 | maintaining of the mailing-list at hub-wue. |
17 | 17 | ||
diff --git a/Documentation/isdn/README b/Documentation/isdn/README index 761595243931..6783437f21c2 100644 --- a/Documentation/isdn/README +++ b/Documentation/isdn/README | |||
@@ -402,7 +402,7 @@ README for the ISDN-subsystem | |||
402 | the script tools/tcltk/isdnmon. You can add actions for line-status | 402 | the script tools/tcltk/isdnmon. You can add actions for line-status |
403 | changes. See the comments at the beginning of the script for how to | 403 | changes. See the comments at the beginning of the script for how to |
404 | do that. There are other tty-based tools in the tools-subdirectory | 404 | do that. There are other tty-based tools in the tools-subdirectory |
405 | contributed by Michael Knigge (imon), Volker Götz (imontty) and | 405 | contributed by Michael Knigge (imon), Volker Götz (imontty) and |
406 | Andreas Kool (isdnmon). | 406 | Andreas Kool (isdnmon). |
407 | 407 | ||
408 | l) For initial testing, you can set the verbose-level to 2 (default: 0). | 408 | l) For initial testing, you can set the verbose-level to 2 (default: 0). |
diff --git a/Documentation/isdn/README.icn b/Documentation/isdn/README.icn index a5f55eadb3ca..13f833d4e910 100644 --- a/Documentation/isdn/README.icn +++ b/Documentation/isdn/README.icn | |||
@@ -3,8 +3,8 @@ $Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $ | |||
3 | You can get the ICN-ISDN-card from: | 3 | You can get the ICN-ISDN-card from: |
4 | 4 | ||
5 | Thinking Objects Software GmbH | 5 | Thinking Objects Software GmbH |
6 | Versbacher Röthe 159 | 6 | Versbacher Röthe 159 |
7 | 97078 Würzburg | 7 | 97078 Würzburg |
8 | Tel: +49 931 2877950 | 8 | Tel: +49 931 2877950 |
9 | Fax: +49 931 2877951 | 9 | Fax: +49 931 2877951 |
10 | 10 | ||
diff --git a/Documentation/java.txt b/Documentation/java.txt index c768dc63b34e..3cce3fbb6644 100644 --- a/Documentation/java.txt +++ b/Documentation/java.txt | |||
@@ -390,7 +390,7 @@ the execution bit, then just do | |||
390 | 390 | ||
391 | 391 | ||
392 | originally by Brian A. Lantz, brian@lantz.com | 392 | originally by Brian A. Lantz, brian@lantz.com |
393 | heavily edited for binfmt_misc by Richard Günther | 393 | heavily edited for binfmt_misc by Richard Günther |
394 | new scripts by Colin J. Watson <cjw44@cam.ac.uk> | 394 | new scripts by Colin J. Watson <cjw44@cam.ac.uk> |
395 | added executable Jar file support by Kurt Huwig <kurt@iku-netz.de> | 395 | added executable Jar file support by Kurt Huwig <kurt@iku-netz.de> |
396 | 396 | ||
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt index c68dafeda7a7..d9e3b199929b 100644 --- a/Documentation/kernel-docs.txt +++ b/Documentation/kernel-docs.txt | |||
@@ -236,7 +236,7 @@ | |||
236 | 236 | ||
237 | * Title: "Design and Implementation of the Second Extended | 237 | * Title: "Design and Implementation of the Second Extended |
238 | Filesystem" | 238 | Filesystem" |
239 | Author: Rémy Card, Theodore Ts'o, Stephen Tweedie. | 239 | Author: Rémy Card, Theodore Ts'o, Stephen Tweedie. |
240 | URL: http://web.mit.edu/tytso/www/linux/ext2intro.html | 240 | URL: http://web.mit.edu/tytso/www/linux/ext2intro.html |
241 | Keywords: ext2, linux fs history, inode, directory, link, devices, | 241 | Keywords: ext2, linux fs history, inode, directory, link, devices, |
242 | VFS, physical structure, performance, benchmarks, ext2fs library, | 242 | VFS, physical structure, performance, benchmarks, ext2fs library, |
diff --git a/Documentation/m68k/README.buddha b/Documentation/m68k/README.buddha index ef484a719bb9..3ea9827ba3c7 100644 --- a/Documentation/m68k/README.buddha +++ b/Documentation/m68k/README.buddha | |||
@@ -204,7 +204,7 @@ always shows a "no IRQ here" on the Buddha, and accesses to | |||
204 | the third IDE port are going into data's Nirwana on the | 204 | the third IDE port are going into data's Nirwana on the |
205 | Buddha. | 205 | Buddha. |
206 | 206 | ||
207 | Jens Schönfeld february 19th, 1997 | 207 | Jens Schönfeld february 19th, 1997 |
208 | updated may 27th, 1997 | 208 | updated may 27th, 1997 |
209 | eMail: sysop@nostlgic.tng.oche.de | 209 | eMail: sysop@nostlgic.tng.oche.de |
210 | 210 | ||
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt index 0e740c812d12..bd450e797558 100644 --- a/Documentation/magic-number.txt +++ b/Documentation/magic-number.txt | |||
@@ -129,7 +129,7 @@ SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c | |||
129 | GDA_MAGIC 0x58464552 gda include/asm-mips64/sn/gda.h | 129 | GDA_MAGIC 0x58464552 gda include/asm-mips64/sn/gda.h |
130 | RED_MAGIC1 0x5a2cf071 (any) mm/slab.c | 130 | RED_MAGIC1 0x5a2cf071 (any) mm/slab.c |
131 | STL_PORTMAGIC 0x5a7182c9 stlport include/linux/stallion.h | 131 | STL_PORTMAGIC 0x5a7182c9 stlport include/linux/stallion.h |
132 | EEPROM_MAGIC_VALUE 0X5ab478d2 lanai_dev drivers/atm/lanai.c | 132 | EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev drivers/atm/lanai.c |
133 | HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state include/linux/hdlcdrv.h | 133 | HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state include/linux/hdlcdrv.h |
134 | EPCA_MAGIC 0x5c6df104 channel include/linux/epca.h | 134 | EPCA_MAGIC 0x5c6df104 channel include/linux/epca.h |
135 | PCXX_MAGIC 0x5c6df104 channel drivers/char/pcxx.h | 135 | PCXX_MAGIC 0x5c6df104 channel drivers/char/pcxx.h |
diff --git a/Documentation/netlabel/introduction.txt b/Documentation/netlabel/introduction.txt index a4ffba1694c8..5ecd8d1dcf4e 100644 --- a/Documentation/netlabel/introduction.txt +++ b/Documentation/netlabel/introduction.txt | |||
@@ -30,7 +30,7 @@ The communication layer exists to allow NetLabel configuration and monitoring | |||
30 | from user space. The NetLabel communication layer uses a message based | 30 | from user space. The NetLabel communication layer uses a message based |
31 | protocol built on top of the Generic NETLINK transport mechanism. The exact | 31 | protocol built on top of the Generic NETLINK transport mechanism. The exact |
32 | formatting of these NetLabel messages as well as the Generic NETLINK family | 32 | formatting of these NetLabel messages as well as the Generic NETLINK family |
33 | names can be found in the the 'net/netlabel/' directory as comments in the | 33 | names can be found in the 'net/netlabel/' directory as comments in the |
34 | header files as well as in 'include/net/netlabel.h'. | 34 | header files as well as in 'include/net/netlabel.h'. |
35 | 35 | ||
36 | * Security Module API | 36 | * Security Module API |
diff --git a/Documentation/networking/6pack.txt b/Documentation/networking/6pack.txt index 48ed2b711bd2..d0777a1200e1 100644 --- a/Documentation/networking/6pack.txt +++ b/Documentation/networking/6pack.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | This is the 6pack-mini-HOWTO, written by | 1 | This is the 6pack-mini-HOWTO, written by |
2 | 2 | ||
3 | Andreas Könsgen DG3KQ | 3 | Andreas Könsgen DG3KQ |
4 | Internet: ajk@iehk.rwth-aachen.de | 4 | Internet: ajk@iehk.rwth-aachen.de |
5 | AMPR-net: dg3kq@db0pra.ampr.org | 5 | AMPR-net: dg3kq@db0pra.ampr.org |
6 | AX.25: dg3kq@db0ach.#nrw.deu.eu | 6 | AX.25: dg3kq@db0ach.#nrw.deu.eu |
diff --git a/Documentation/networking/NAPI_HOWTO.txt b/Documentation/networking/NAPI_HOWTO.txt index fb8dc6422a52..7907435a661c 100644 --- a/Documentation/networking/NAPI_HOWTO.txt +++ b/Documentation/networking/NAPI_HOWTO.txt | |||
@@ -160,7 +160,7 @@ on current cpu. This primitive is called by dev->poll(), when | |||
160 | it completes its work. The device cannot be out of poll list at this | 160 | it completes its work. The device cannot be out of poll list at this |
161 | call, if it is then clearly it is a BUG(). You'll know ;-> | 161 | call, if it is then clearly it is a BUG(). You'll know ;-> |
162 | 162 | ||
163 | All these above nethods are used below. So keep reading for clarity. | 163 | All of the above methods are used below, so keep reading for clarity. |
164 | 164 | ||
165 | Device driver changes to be made when porting NAPI | 165 | Device driver changes to be made when porting NAPI |
166 | ================================================== | 166 | ================================================== |
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 5a232d946be3..db0cd5169581 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
@@ -13,7 +13,7 @@ You can find the latest version of this document at | |||
13 | 13 | ||
14 | Please send me your comments to | 14 | Please send me your comments to |
15 | 15 | ||
16 | Ulisses Alonso Camaró <uaca@i.hate.spam.alumni.uv.es> | 16 | Ulisses Alonso Camaró <uaca@i.hate.spam.alumni.uv.es> |
17 | 17 | ||
18 | ------------------------------------------------------------------------------- | 18 | ------------------------------------------------------------------------------- |
19 | + Why use PACKET_MMAP | 19 | + Why use PACKET_MMAP |
diff --git a/Documentation/networking/slicecom.hun b/Documentation/networking/slicecom.hun index 5acf1918694a..bed2f045e550 100644 --- a/Documentation/networking/slicecom.hun +++ b/Documentation/networking/slicecom.hun | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | SliceCOM adapter felhasznaloi dokumentacioja - 0.51 verziohoz | 2 | SliceCOM adapter felhasznaloi dokumentacioja - 0.51 verziohoz |
3 | 3 | ||
4 | Bartók István <bartoki@itc.hu> | 4 | Bartók István <bartoki@itc.hu> |
5 | Utolso modositas: Wed Aug 29 17:26:58 CEST 2001 | 5 | Utolso modositas: Wed Aug 29 17:26:58 CEST 2001 |
6 | 6 | ||
7 | ----------------------------------------------------------------- | 7 | ----------------------------------------------------------------- |
diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt index 32d3b916afad..c82c0cf981b4 100644 --- a/Documentation/networking/slicecom.txt +++ b/Documentation/networking/slicecom.txt | |||
@@ -1,9 +1,9 @@ | |||
1 | 1 | ||
2 | SliceCOM adapter user's documentation - for the 0.51 driver version | 2 | SliceCOM adapter user's documentation - for the 0.51 driver version |
3 | 3 | ||
4 | Written by Bartók István <bartoki@itc.hu> | 4 | Written by Bartók István <bartoki@itc.hu> |
5 | 5 | ||
6 | English translation: Lakatos György <gyuri@itc.hu> | 6 | English translation: Lakatos György <gyuri@itc.hu> |
7 | Mon Dec 11 15:28:42 CET 2000 | 7 | Mon Dec 11 15:28:42 CET 2000 |
8 | 8 | ||
9 | Last modified: Wed Aug 29 17:25:37 CEST 2001 | 9 | Last modified: Wed Aug 29 17:25:37 CEST 2001 |
diff --git a/Documentation/networking/tms380tr.txt b/Documentation/networking/tms380tr.txt index c169a57bc925..1f73e13058df 100644 --- a/Documentation/networking/tms380tr.txt +++ b/Documentation/networking/tms380tr.txt | |||
@@ -71,24 +71,24 @@ Below find attached the setting for the SK NET TR 4/16 ISA adapters | |||
71 | CHAPTER 1 LOCATION OF DIP-SWITCH | 71 | CHAPTER 1 LOCATION OF DIP-SWITCH |
72 | ============================================================== | 72 | ============================================================== |
73 | 73 | ||
74 | UÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ | 74 | UÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ |
75 | þUÄÄÄÄÄÄ¿ UÄÄÄÄÄ¿ UÄÄÄ¿ þ | 75 | þUÄÄÄÄÄÄ¿ UÄÄÄÄÄ¿ UÄÄÄ¿ þ |
76 | þAÄÄÄÄÄÄU W1 AÄÄÄÄÄU UÄÄÄÄ¿ þ þ þ | 76 | þAÄÄÄÄÄÄU W1 AÄÄÄÄÄU UÄÄÄÄ¿ þ þ þ |
77 | þUÄÄÄÄÄÄ¿ þ þ þ þ UÄÄÅ¿ | 77 | þUÄÄÄÄÄÄ¿ þ þ þ þ UÄÄÅ¿ |
78 | þAÄÄÄÄÄÄU UÄÄÄÄÄÄÄÄÄÄÄ¿ AÄÄÄÄU þ þ þ þþ | 78 | þAÄÄÄÄÄÄU UÄÄÄÄÄÄÄÄÄÄÄ¿ AÄÄÄÄU þ þ þ þþ |
79 | þUÄÄÄÄÄÄ¿ þ þ UÄÄÄ¿ AÄÄÄU AÄÄÅU | 79 | þUÄÄÄÄÄÄ¿ þ þ UÄÄÄ¿ AÄÄÄU AÄÄÅU |
80 | þAÄÄÄÄÄÄU þ TMS380C26 þ þ þ þ | 80 | þAÄÄÄÄÄÄU þ TMS380C26 þ þ þ þ |
81 | þUÄÄÄÄÄÄ¿ þ þ AÄÄÄU AÄ¿ | 81 | þUÄÄÄÄÄÄ¿ þ þ AÄÄÄU AÄ¿ |
82 | þAÄÄÄÄÄÄU þ þ þ þ | 82 | þAÄÄÄÄÄÄU þ þ þ þ |
83 | þ AÄÄÄÄÄÄÄÄÄÄÄU þ þ | 83 | þ AÄÄÄÄÄÄÄÄÄÄÄU þ þ |
84 | þ þ þ | 84 | þ þ þ |
85 | þ AÄU | 85 | þ AÄU |
86 | þ þ | 86 | þ þ |
87 | þ þ | 87 | þ þ |
88 | þ þ | 88 | þ þ |
89 | þ þ | 89 | þ þ |
90 | AÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄU | 90 | AÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄU |
91 | AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU | 91 | AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU |
92 | 92 | ||
93 | ============================================================== | 93 | ============================================================== |
94 | CHAPTER 2 DEFAULT SETTINGS | 94 | CHAPTER 2 DEFAULT SETTINGS |
@@ -108,9 +108,9 @@ AÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄU | |||
108 | CHAPTER 3 DIP SWITCH W1 DESCRIPTION | 108 | CHAPTER 3 DIP SWITCH W1 DESCRIPTION |
109 | ============================================================== | 109 | ============================================================== |
110 | 110 | ||
111 | UÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄ¿ ON | 111 | UÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄ¿ ON |
112 | þ 1 þ 2 þ 3 þ 4 þ 5 þ 6 þ 7 þ 8 þ | 112 | þ 1 þ 2 þ 3 þ 4 þ 5 þ 6 þ 7 þ 8 þ |
113 | AÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄU OFF | 113 | AÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄU OFF |
114 | |AD | BootROM Addr. | I/O | | 114 | |AD | BootROM Addr. | I/O | |
115 | +-+-+-------+-------+-----+-----+ | 115 | +-+-+-------+-------+-----+-----+ |
116 | | | | | 116 | | | | |
diff --git a/Documentation/networking/udplite.txt b/Documentation/networking/udplite.txt index dd6f46b83dab..6be09ba24a36 100644 --- a/Documentation/networking/udplite.txt +++ b/Documentation/networking/udplite.txt | |||
@@ -139,7 +139,7 @@ | |||
139 | 3) Disabling the Checksum Computation | 139 | 3) Disabling the Checksum Computation |
140 | 140 | ||
141 | On both sender and receiver, checksumming will always be performed | 141 | On both sender and receiver, checksumming will always be performed |
142 | and can not be disabled using SO_NO_CHECK. Thus | 142 | and cannot be disabled using SO_NO_CHECK. Thus |
143 | 143 | ||
144 | setsockopt(sockfd, SOL_SOCKET, SO_NO_CHECK, ... ); | 144 | setsockopt(sockfd, SOL_SOCKET, SO_NO_CHECK, ... ); |
145 | 145 | ||
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt index 07dd6d9930a1..bc2ab419a74a 100644 --- a/Documentation/networking/wan-router.txt +++ b/Documentation/networking/wan-router.txt | |||
@@ -335,7 +335,7 @@ REVISION HISTORY | |||
335 | creating applications using BiSync | 335 | creating applications using BiSync |
336 | streaming. | 336 | streaming. |
337 | 337 | ||
338 | 2.0.5 Aug 04, 1999 CHDLC initializatin bug fix. | 338 | 2.0.5 Aug 04, 1999 CHDLC initialization bug fix. |
339 | PPP interrupt driven driver: | 339 | PPP interrupt driven driver: |
340 | Fix to the PPP line hangup problem. | 340 | Fix to the PPP line hangup problem. |
341 | New PPP firmware | 341 | New PPP firmware |
@@ -372,7 +372,7 @@ REVISION HISTORY | |||
372 | o cfgft1 GUI csu/dsu configurator | 372 | o cfgft1 GUI csu/dsu configurator |
373 | o wancfg GUI configuration file | 373 | o wancfg GUI configuration file |
374 | configurator. | 374 | configurator. |
375 | o Architectual directory changes. | 375 | o Architectural directory changes. |
376 | 376 | ||
377 | beta-2.1.4 Jul 2000 o Dynamic interface configuration: | 377 | beta-2.1.4 Jul 2000 o Dynamic interface configuration: |
378 | Network interfaces reflect the state | 378 | Network interfaces reflect the state |
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index e2c9d0a0c43d..d38261b67905 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt | |||
@@ -373,7 +373,7 @@ E.g. clearing pending interrupts. | |||
373 | 373 | ||
374 | 3.6 Register IRQ handler | 374 | 3.6 Register IRQ handler |
375 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 375 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
376 | While calling request_irq() is the the last step described here, | 376 | While calling request_irq() is the last step described here, |
377 | this is often just another intermediate step to initialize a device. | 377 | this is often just another intermediate step to initialize a device. |
378 | This step can often be deferred until the device is opened for use. | 378 | This step can often be deferred until the device is opened for use. |
379 | 379 | ||
diff --git a/Documentation/pcieaer-howto.txt b/Documentation/pcieaer-howto.txt index 16c251230c82..d5da86170106 100644 --- a/Documentation/pcieaer-howto.txt +++ b/Documentation/pcieaer-howto.txt | |||
@@ -13,7 +13,7 @@ Reporting (AER) driver and provides information on how to use it, as | |||
13 | well as how to enable the drivers of endpoint devices to conform with | 13 | well as how to enable the drivers of endpoint devices to conform with |
14 | PCI Express AER driver. | 14 | PCI Express AER driver. |
15 | 15 | ||
16 | 1.2 Copyright © Intel Corporation 2006. | 16 | 1.2 Copyright © Intel Corporation 2006. |
17 | 17 | ||
18 | 1.3 What is the PCI Express AER Driver? | 18 | 1.3 What is the PCI Express AER Driver? |
19 | 19 | ||
diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt index 28037aa1846c..481faf515d53 100644 --- a/Documentation/pnp.txt +++ b/Documentation/pnp.txt | |||
@@ -140,7 +140,7 @@ Plug and Play but it is planned to be in the near future. | |||
140 | Requirements for a Linux PnP protocol: | 140 | Requirements for a Linux PnP protocol: |
141 | 1.) the protocol must use EISA IDs | 141 | 1.) the protocol must use EISA IDs |
142 | 2.) the protocol must inform the PnP Layer of a devices current configuration | 142 | 2.) the protocol must inform the PnP Layer of a devices current configuration |
143 | - the ability to set resources is optional but prefered. | 143 | - the ability to set resources is optional but preferred. |
144 | 144 | ||
145 | The following are PnP protocol related functions: | 145 | The following are PnP protocol related functions: |
146 | 146 | ||
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index c55bd5079b90..5b8d6953f05e 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -48,7 +48,7 @@ before suspend (it is limited to 500 MB by default). | |||
48 | 48 | ||
49 | Article about goals and implementation of Software Suspend for Linux | 49 | Article about goals and implementation of Software Suspend for Linux |
50 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 50 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
51 | Author: G‚ábor Kuti | 51 | Author: G‚ábor Kuti |
52 | Last revised: 2003-10-20 by Pavel Machek | 52 | Last revised: 2003-10-20 by Pavel Machek |
53 | 53 | ||
54 | Idea and goals to achieve | 54 | Idea and goals to achieve |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index d4bfae75c946..b49ce169a63a 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -1444,7 +1444,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
1444 | Basically, it is a bus of devices, that could act more or less | 1444 | Basically, it is a bus of devices, that could act more or less |
1445 | as a complete entity (UCC, USB etc ). All of them should be siblings on | 1445 | as a complete entity (UCC, USB etc ). All of them should be siblings on |
1446 | the "root" qe node, using the common properties from there. | 1446 | the "root" qe node, using the common properties from there. |
1447 | The description below applies to the the qe of MPC8360 and | 1447 | The description below applies to the qe of MPC8360 and |
1448 | more nodes and properties would be extended in the future. | 1448 | more nodes and properties would be extended in the future. |
1449 | 1449 | ||
1450 | i) Root QE device | 1450 | i) Root QE device |
@@ -1633,7 +1633,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
1633 | - assignment : function number of the pin according to the Pin Assignment | 1633 | - assignment : function number of the pin according to the Pin Assignment |
1634 | tables in User Manual. Each pin can have up to 4 possible functions in | 1634 | tables in User Manual. Each pin can have up to 4 possible functions in |
1635 | QE and two options for CPM. | 1635 | QE and two options for CPM. |
1636 | - has_irq : indicates if the pin is used as source of exteral | 1636 | - has_irq : indicates if the pin is used as source of external |
1637 | interrupts. | 1637 | interrupts. |
1638 | 1638 | ||
1639 | Example: | 1639 | Example: |
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index 0993969609cf..d30a281c570f 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt | |||
@@ -2209,7 +2209,7 @@ Breakpoint 2 at 0x4d87a4: file top.c, line 2609. | |||
2209 | #3 0x5167e6 in readline_internal_char () at readline.c:454 | 2209 | #3 0x5167e6 in readline_internal_char () at readline.c:454 |
2210 | #4 0x5168ee in readline_internal_charloop () at readline.c:507 | 2210 | #4 0x5168ee in readline_internal_charloop () at readline.c:507 |
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 (prrompt=0x564420 "(gdb) ", repeat=1, |
2215 | annotation_suffix=0x4d6b44 "prompt") at top.c:2091 | 2215 | annotation_suffix=0x4d6b44 "prompt") at top.c:2091 |
diff --git a/Documentation/scsi/aha152x.txt b/Documentation/scsi/aha152x.txt index 2ce022cec9be..29ce6d87e451 100644 --- a/Documentation/scsi/aha152x.txt +++ b/Documentation/scsi/aha152x.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | $Id: README.aha152x,v 1.2 1999/12/25 15:32:30 fischer Exp fischer $ | 1 | $Id: README.aha152x,v 1.2 1999/12/25 15:32:30 fischer Exp fischer $ |
2 | Adaptec AHA-1520/1522 SCSI driver for Linux (aha152x) | 2 | Adaptec AHA-1520/1522 SCSI driver for Linux (aha152x) |
3 | 3 | ||
4 | Copyright 1993-1999 Jürgen Fischer <fischer@norbit.de> | 4 | Copyright 1993-1999 Jürgen Fischer <fischer@norbit.de> |
5 | TC1550 patches by Luuk van Dijk (ldz@xs4all.nl) | 5 | TC1550 patches by Luuk van Dijk (ldz@xs4all.nl) |
6 | 6 | ||
7 | 7 | ||
diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt index 9b894f116d95..5f34d2ba69b4 100644 --- a/Documentation/scsi/aic7xxx.txt +++ b/Documentation/scsi/aic7xxx.txt | |||
@@ -40,7 +40,7 @@ The following information is available in this file: | |||
40 | 2. Multi-function Twin Channel Device - Two controllers on one chip. | 40 | 2. Multi-function Twin Channel Device - Two controllers on one chip. |
41 | 3. Command Channel Secondary DMA Engine - Allows scatter gather list | 41 | 3. Command Channel Secondary DMA Engine - Allows scatter gather list |
42 | and SCB prefetch. | 42 | and SCB prefetch. |
43 | 4. 64 Byte SCB Support - Allows disconnected, unttagged request table | 43 | 4. 64 Byte SCB Support - Allows disconnected, untagged request table |
44 | for all possible target/lun combinations. | 44 | for all possible target/lun combinations. |
45 | 5. Block Move Instruction Support - Doubles the speed of certain | 45 | 5. Block Move Instruction Support - Doubles the speed of certain |
46 | sequencer operations. | 46 | sequencer operations. |
diff --git a/Documentation/scsi/aic7xxx_old.txt b/Documentation/scsi/aic7xxx_old.txt index 05667e7308d4..7bd210ab45a1 100644 --- a/Documentation/scsi/aic7xxx_old.txt +++ b/Documentation/scsi/aic7xxx_old.txt | |||
@@ -356,7 +356,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD | |||
356 | or enable Tagged Command Queueing (TCQ) on specific devices. As of | 356 | or enable Tagged Command Queueing (TCQ) on specific devices. As of |
357 | driver version 5.1.11, TCQ is now either on or off by default | 357 | driver version 5.1.11, TCQ is now either on or off by default |
358 | according to the setting you choose during the make config process. | 358 | according to the setting you choose during the make config process. |
359 | In order to en/disable TCQ for certian devices at boot time, a user | 359 | In order to en/disable TCQ for certain devices at boot time, a user |
360 | may use this boot param. The driver will then parse this message out | 360 | may use this boot param. The driver will then parse this message out |
361 | and en/disable the specific device entries that are present based upon | 361 | and en/disable the specific device entries that are present based upon |
362 | the value given. The param line is parsed in the following manner: | 362 | the value given. The param line is parsed in the following manner: |
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 88ef88b949f7..39d409a8efe5 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt | |||
@@ -1260,7 +1260,7 @@ then the request of the IRQ obviously will not succeed for all the drivers. | |||
1260 | 15.1 Problem tracking | 1260 | 15.1 Problem tracking |
1261 | 1261 | ||
1262 | Most SCSI problems are due to a non conformant SCSI bus or to buggy | 1262 | Most SCSI problems are due to a non conformant SCSI bus or to buggy |
1263 | devices. If infortunately you have SCSI problems, you can check the | 1263 | devices. If unfortunately you have SCSI problems, you can check the |
1264 | following things: | 1264 | following things: |
1265 | 1265 | ||
1266 | - SCSI bus cables | 1266 | - SCSI bus cables |
diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt index 3c12422f7f41..b7be95b5bd24 100644 --- a/Documentation/scsi/st.txt +++ b/Documentation/scsi/st.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | This file contains brief information about the SCSI tape driver. | 1 | This file contains brief information about the SCSI tape driver. |
2 | The driver is currently maintained by Kai Mäkisara (email | 2 | The driver is currently maintained by Kai Mäkisara (email |
3 | Kai.Makisara@kolumbus.fi) | 3 | Kai.Makisara@kolumbus.fi) |
4 | 4 | ||
5 | Last modified: Mon Mar 7 21:14:44 2005 by kai.makisara | 5 | Last modified: Mon Mar 7 21:14:44 2005 by kai.makisara |
diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt index 2c1745a9df00..3d9f06bb3d00 100644 --- a/Documentation/scsi/sym53c8xx_2.txt +++ b/Documentation/scsi/sym53c8xx_2.txt | |||
@@ -587,7 +587,7 @@ devices, ... may cause a SCSI signal to be wrong when te driver reads it. | |||
587 | 15.1 Problem tracking | 587 | 15.1 Problem tracking |
588 | 588 | ||
589 | Most SCSI problems are due to a non conformant SCSI bus or too buggy | 589 | Most SCSI problems are due to a non conformant SCSI bus or too buggy |
590 | devices. If infortunately you have SCSI problems, you can check the | 590 | devices. If unfortunately you have SCSI problems, you can check the |
591 | following things: | 591 | following things: |
592 | 592 | ||
593 | - SCSI bus cables | 593 | - SCSI bus cables |
diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt index 8b2168aa4fc7..61c0531e044a 100644 --- a/Documentation/scsi/tmscsim.txt +++ b/Documentation/scsi/tmscsim.txt | |||
@@ -426,7 +426,7 @@ Thanks to Linus Torvalds, Alan Cox, the FSF people, the XFree86 team and | |||
426 | all the others for the wonderful OS and software. | 426 | all the others for the wonderful OS and software. |
427 | Thanks to C.L. Huang and Philip Giang (Tekram) for the initial driver | 427 | Thanks to C.L. Huang and Philip Giang (Tekram) for the initial driver |
428 | release and support. | 428 | release and support. |
429 | Thanks to Doug Ledford, Gérard Roudier for support with SCSI coding. | 429 | Thanks to Doug Ledford, Gérard Roudier for support with SCSI coding. |
430 | Thanks to a lot of people (espec. Chiaki Ishikawa, Andreas Haumer, Hubert | 430 | Thanks to a lot of people (espec. Chiaki Ishikawa, Andreas Haumer, Hubert |
431 | Tonneau) for intensively testing the driver (and even risking data loss | 431 | Tonneau) for intensively testing the driver (and even risking data loss |
432 | doing this during early revisions). | 432 | doing this during early revisions). |
diff --git a/Documentation/sonypi.txt b/Documentation/sonypi.txt index c1237a925505..4857acfc50f1 100644 --- a/Documentation/sonypi.txt +++ b/Documentation/sonypi.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | Sony Programmable I/O Control Device Driver Readme | 1 | Sony Programmable I/O Control Device Driver Readme |
2 | -------------------------------------------------- | 2 | -------------------------------------------------- |
3 | Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 3 | Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
4 | Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 4 | Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
5 | Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> | 5 | Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> |
6 | Copyright (C) 2001 Junichi Morita <jun1m@mars.dti.ne.jp> | 6 | Copyright (C) 2001 Junichi Morita <jun1m@mars.dti.ne.jp> |
7 | Copyright (C) 2000 Takaya Kinjo <t-kinjo@tc4.so-net.ne.jp> | 7 | Copyright (C) 2000 Takaya Kinjo <t-kinjo@tc4.so-net.ne.jp> |
diff --git a/Documentation/sound/oss/mwave b/Documentation/sound/oss/mwave index 858334bb46b0..5fbcb1609275 100644 --- a/Documentation/sound/oss/mwave +++ b/Documentation/sound/oss/mwave | |||
@@ -163,7 +163,7 @@ OR the Default= line COULD be | |||
163 | Default=SBPRO | 163 | Default=SBPRO |
164 | 164 | ||
165 | Reboot to Windows 95 and choose Linux. When booted, use sndconfig to configure | 165 | Reboot to Windows 95 and choose Linux. When booted, use sndconfig to configure |
166 | the sound modules and voilà - ThinkPad sound with Linux. | 166 | the sound modules and voilà - ThinkPad sound with Linux. |
167 | 167 | ||
168 | Now the gotchas - you can either have CD sound OR Mixers but not both. That's a | 168 | Now the gotchas - you can either have CD sound OR Mixers but not both. That's a |
169 | problem with the SB1.5 (CD sound) or SBPRO (Mixers) settings. No one knows why | 169 | problem with the SB1.5 (CD sound) or SBPRO (Mixers) settings. No one knows why |
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 5922e84d9133..111fd28727ec 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
@@ -221,14 +221,14 @@ Controls the kernel's behaviour when an oops or BUG is encountered. | |||
221 | 221 | ||
222 | 0: try to continue operation | 222 | 0: try to continue operation |
223 | 223 | ||
224 | 1: panic immediatly. If the `panic' sysctl is also non-zero then the | 224 | 1: panic immediately. If the `panic' sysctl is also non-zero then the |
225 | machine will be rebooted. | 225 | machine will be rebooted. |
226 | 226 | ||
227 | ============================================================== | 227 | ============================================================== |
228 | 228 | ||
229 | pid_max: | 229 | pid_max: |
230 | 230 | ||
231 | PID allocation wrap value. When the kenrel's next PID value | 231 | PID allocation wrap value. When the kernel's next PID value |
232 | reaches this value, it wraps back to a minimum PID value. | 232 | reaches this value, it wraps back to a minimum PID value. |
233 | PIDs of value pid_max or larger are not allocated. | 233 | PIDs of value pid_max or larger are not allocated. |
234 | 234 | ||
diff --git a/Documentation/usb/CREDITS b/Documentation/usb/CREDITS index 27a721635f92..67c59cdc9959 100644 --- a/Documentation/usb/CREDITS +++ b/Documentation/usb/CREDITS | |||
@@ -65,7 +65,7 @@ THANKS file in Inaky's driver): | |||
65 | will sell keyboards to some of the 3 million (at least) | 65 | will sell keyboards to some of the 3 million (at least) |
66 | Linux users. | 66 | Linux users. |
67 | 67 | ||
68 | - Many thanks to ing büro h doran [http://www.ibhdoran.com]! | 68 | - Many thanks to ing büro h doran [http://www.ibhdoran.com]! |
69 | It was almost impossible to get a PC backplate USB connector | 69 | It was almost impossible to get a PC backplate USB connector |
70 | for the motherboard here at Europe (mine, home-made, was | 70 | for the motherboard here at Europe (mine, home-made, was |
71 | quite lousy :). Now I know where to acquire nice USB stuff! | 71 | quite lousy :). Now I know where to acquire nice USB stuff! |
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt index b18e86a22506..5b635ae84944 100644 --- a/Documentation/usb/usb-serial.txt +++ b/Documentation/usb/usb-serial.txt | |||
@@ -45,9 +45,9 @@ ConnectTech WhiteHEAT 4 port converter | |||
45 | Connect Tech's Support Department at support@connecttech.com | 45 | Connect Tech's Support Department at support@connecttech.com |
46 | 46 | ||
47 | 47 | ||
48 | HandSpring Visor, Palm USB, and Clié USB driver | 48 | HandSpring Visor, Palm USB, and Clié USB driver |
49 | 49 | ||
50 | This driver works with all HandSpring USB, Palm USB, and Sony Clié USB | 50 | This driver works with all HandSpring USB, Palm USB, and Sony Clié USB |
51 | devices. | 51 | devices. |
52 | 52 | ||
53 | Only when the device tries to connect to the host, will the device show | 53 | Only when the device tries to connect to the host, will the device show |
@@ -69,7 +69,7 @@ HandSpring Visor, Palm USB, and Clié USB driver | |||
69 | the port to use for the HotSync transfer. The "Generic" port can be used | 69 | the port to use for the HotSync transfer. The "Generic" port can be used |
70 | for other device communication, such as a PPP link. | 70 | for other device communication, such as a PPP link. |
71 | 71 | ||
72 | For some Sony Clié devices, /dev/ttyUSB0 must be used to talk to the | 72 | For some Sony Clié devices, /dev/ttyUSB0 must be used to talk to the |
73 | device. This is true for all OS version 3.5 devices, and most devices | 73 | device. This is true for all OS version 3.5 devices, and most devices |
74 | that have had a flash upgrade to a newer version of the OS. See the | 74 | that have had a flash upgrade to a newer version of the OS. See the |
75 | kernel system log for information on which is the correct port to use. | 75 | kernel system log for information on which is the correct port to use. |
diff --git a/Documentation/video4linux/README.pvrusb2 b/Documentation/video4linux/README.pvrusb2 index a4b7ae800866..a747200fe67c 100644 --- a/Documentation/video4linux/README.pvrusb2 +++ b/Documentation/video4linux/README.pvrusb2 | |||
@@ -8,7 +8,7 @@ Background: | |||
8 | 8 | ||
9 | This driver is intended for the "Hauppauge WinTV PVR USB 2.0", which | 9 | This driver is intended for the "Hauppauge WinTV PVR USB 2.0", which |
10 | is a USB 2.0 hosted TV Tuner. This driver is a work in progress. | 10 | is a USB 2.0 hosted TV Tuner. This driver is a work in progress. |
11 | Its history started with the reverse-engineering effort by Björn | 11 | Its history started with the reverse-engineering effort by Björn |
12 | Danielsson <pvrusb2@dax.nu> whose web page can be found here: | 12 | Danielsson <pvrusb2@dax.nu> whose web page can be found here: |
13 | 13 | ||
14 | http://pvrusb2.dax.nu/ | 14 | http://pvrusb2.dax.nu/ |
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 85c575ac4fb9..295462b2317a 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
@@ -242,7 +242,7 @@ can generate: PAL , NTSC , SECAM | |||
242 | 242 | ||
243 | Conexant bt866 TV encoder | 243 | Conexant bt866 TV encoder |
244 | is used in AVS6EYES, and | 244 | is used in AVS6EYES, and |
245 | can generate: NTSC/PAL, PALM, PALN | 245 | can generate: NTSC/PAL, PALÂM, PALÂN |
246 | 246 | ||
247 | The adv717x, should be able to produce PAL N. But you find nothing PAL N | 247 | The adv717x, should be able to produce PAL N. But you find nothing PAL N |
248 | specific in the registers. Seem that you have to reuse a other standard | 248 | specific in the registers. Seem that you have to reuse a other standard |
diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt index 5e51c59bf2b0..bf3af5fe558f 100644 --- a/Documentation/video4linux/meye.txt +++ b/Documentation/video4linux/meye.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | Vaio Picturebook Motion Eye Camera Driver Readme | 1 | Vaio Picturebook Motion Eye Camera Driver Readme |
2 | ------------------------------------------------ | 2 | ------------------------------------------------ |
3 | Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 3 | Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
4 | Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 4 | Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
5 | Copyright (C) 2000 Andrew Tridgell <tridge@samba.org> | 5 | Copyright (C) 2000 Andrew Tridgell <tridge@samba.org> |
6 | 6 | ||
7 | This driver enable the use of video4linux compatible applications with the | 7 | This driver enable the use of video4linux compatible applications with the |
diff --git a/Documentation/video4linux/ov511.txt b/Documentation/video4linux/ov511.txt index 79af610d4ba5..b3326b167ada 100644 --- a/Documentation/video4linux/ov511.txt +++ b/Documentation/video4linux/ov511.txt | |||
@@ -195,11 +195,11 @@ MODULE PARAMETERS: | |||
195 | NAME: bandingfilter | 195 | NAME: bandingfilter |
196 | TYPE: integer (Boolean) | 196 | TYPE: integer (Boolean) |
197 | DEFAULT: 0 (off) | 197 | DEFAULT: 0 (off) |
198 | DESC: Enables the sensor´s banding filter exposure algorithm. This reduces | 198 | DESC: Enables the sensor´s banding filter exposure algorithm. This reduces |
199 | or stabilizes the "banding" caused by some artificial light sources | 199 | or stabilizes the "banding" caused by some artificial light sources |
200 | (especially fluorescent). You might have to set lightfreq correctly for | 200 | (especially fluorescent). You might have to set lightfreq correctly for |
201 | this to work right. As an added bonus, this sometimes makes it | 201 | this to work right. As an added bonus, this sometimes makes it |
202 | possible to capture your monitor´s output. | 202 | possible to capture your monitor´s output. |
203 | 203 | ||
204 | NAME: fastset | 204 | NAME: fastset |
205 | TYPE: integer (Boolean) | 205 | TYPE: integer (Boolean) |
diff --git a/MAINTAINERS b/MAINTAINERS index 41a4b477c576..3b46f43c338b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1038,6 +1038,8 @@ S: Maintained | |||
1038 | CONEXANT ACCESSRUNNER USB DRIVER | 1038 | CONEXANT ACCESSRUNNER USB DRIVER |
1039 | P: Simon Arlott | 1039 | P: Simon Arlott |
1040 | M: cxacru@fire.lp0.eu | 1040 | M: cxacru@fire.lp0.eu |
1041 | L: accessrunner-general@lists.sourceforge.net | ||
1042 | W: http://accessrunner.sourceforge.net/ | ||
1041 | S: Maintained | 1043 | S: Maintained |
1042 | 1044 | ||
1043 | CORETEMP HARDWARE MONITORING DRIVER | 1045 | CORETEMP HARDWARE MONITORING DRIVER |
@@ -2800,7 +2802,7 @@ L: linux-abi-devel@lists.sourceforge.net | |||
2800 | S: Maintained | 2802 | S: Maintained |
2801 | 2803 | ||
2802 | PHRAM MTD DRIVER | 2804 | PHRAM MTD DRIVER |
2803 | P: Jörn Engel | 2805 | P: Jörn Engel |
2804 | M: joern@wh.fh-wedel.de | 2806 | M: joern@wh.fh-wedel.de |
2805 | L: linux-mtd@lists.infradead.org | 2807 | L: linux-mtd@lists.infradead.org |
2806 | S: Maintained | 2808 | S: Maintained |
@@ -3074,7 +3076,7 @@ T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git | |||
3074 | S: Maintained | 3076 | S: Maintained |
3075 | 3077 | ||
3076 | SCSI TAPE DRIVER | 3078 | SCSI TAPE DRIVER |
3077 | P: Kai Mäkisara | 3079 | P: Kai Mäkisara |
3078 | M: Kai.Makisara@kolumbus.fi | 3080 | M: Kai.Makisara@kolumbus.fi |
3079 | L: linux-scsi@vger.kernel.org | 3081 | L: linux-scsi@vger.kernel.org |
3080 | S: Maintained | 3082 | S: Maintained |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index e238ad8cfd8f..018d637f87fc 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -107,7 +107,7 @@ config ARCH_AT91SAM9260_SAM9XE | |||
107 | depends on ARCH_AT91SAM9260 | 107 | depends on ARCH_AT91SAM9260 |
108 | help | 108 | help |
109 | Select this if you are using Atmel's AT91SAM9XE System-on-Chip. | 109 | Select this if you are using Atmel's AT91SAM9XE System-on-Chip. |
110 | They are basicaly AT91SAM9260s with various sizes of embedded Flash. | 110 | They are basically AT91SAM9260s with various sizes of embedded Flash. |
111 | 111 | ||
112 | comment "AT91SAM9260 / AT91SAM9XE Board Type" | 112 | comment "AT91SAM9260 / AT91SAM9XE Board Type" |
113 | 113 | ||
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 8781aaeb576b..c7e229b00f6e 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -84,7 +84,7 @@ config MACH_OMAP_PALMTE | |||
84 | Support for the Palm Tungsten E PDA. Currently only the LCD panel | 84 | Support for the Palm Tungsten E PDA. Currently only the LCD panel |
85 | is supported. To boot the kernel, you'll need a PalmOS compatible | 85 | is supported. To boot the kernel, you'll need a PalmOS compatible |
86 | bootloader; check out http://palmtelinux.sourceforge.net for more | 86 | bootloader; check out http://palmtelinux.sourceforge.net for more |
87 | informations. | 87 | information. |
88 | Say Y here if you have such a PDA, say NO otherwise. | 88 | Say Y here if you have such a PDA, say NO otherwise. |
89 | 89 | ||
90 | config MACH_NOKIA770 | 90 | config MACH_NOKIA770 |
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index 637aaba65390..d1eeed2ad47c 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/s3c2410-sleep.S | 1 | /* linux/arch/arm/mach-s3c2410/sleep.S |
2 | * | 2 | * |
3 | * Copyright (c) 2004 Simtec Electronics | 3 | * Copyright (c) 2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S index 435349dc3243..7b7ae790b00d 100644 --- a/arch/arm/plat-s3c24xx/sleep.S +++ b/arch/arm/plat-s3c24xx/sleep.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/sleep.S | 1 | /* linux/arch/arm/plat-s3c24xx/sleep.S |
2 | * | 2 | * |
3 | * Copyright (c) 2004 Simtec Electronics | 3 | * Copyright (c) 2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index f64624fc4504..1d859c16931e 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -603,7 +603,7 @@ config ETRAX_CARDBUS | |||
603 | select HOTPLUG | 603 | select HOTPLUG |
604 | select PCCARD_NONSTATIC | 604 | select PCCARD_NONSTATIC |
605 | help | 605 | help |
606 | Enabled the ETRAX Carbus driver. | 606 | Enabled the ETRAX Cardbus driver. |
607 | 607 | ||
608 | config PCI | 608 | config PCI |
609 | bool | 609 | bool |
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug index e0e9bcb015a9..554efe604a08 100644 --- a/arch/h8300/Kconfig.debug +++ b/arch/h8300/Kconfig.debug | |||
@@ -21,12 +21,12 @@ config GDB_MAGICPRINT | |||
21 | bool "Message Output for GDB MagicPrint service" | 21 | bool "Message Output for GDB MagicPrint service" |
22 | depends on (H8300H_SIM || H8S_SIM) | 22 | depends on (H8300H_SIM || H8S_SIM) |
23 | help | 23 | help |
24 | kernel messages output useing MagicPrint service from GDB | 24 | kernel messages output using MagicPrint service from GDB |
25 | 25 | ||
26 | config SYSCALL_PRINT | 26 | config SYSCALL_PRINT |
27 | bool "SystemCall trace print" | 27 | bool "SystemCall trace print" |
28 | help | 28 | help |
29 | outout history of systemcall | 29 | output history of systemcall |
30 | 30 | ||
31 | config GDB_DEBUG | 31 | config GDB_DEBUG |
32 | bool "Use gdb stub" | 32 | bool "Use gdb stub" |
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 64ad10f984a1..30944ee2e61a 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -858,9 +858,9 @@ config RELOCATABLE | |||
858 | bool "Build a relocatable kernel(EXPERIMENTAL)" | 858 | bool "Build a relocatable kernel(EXPERIMENTAL)" |
859 | depends on EXPERIMENTAL | 859 | depends on EXPERIMENTAL |
860 | help | 860 | help |
861 | This build a kernel image that retains relocation information | 861 | This builds a kernel image that retains relocation information |
862 | so it can be loaded someplace besides the default 1MB. | 862 | so it can be loaded someplace besides the default 1MB. |
863 | The relocations tend to the kernel binary about 10% larger, | 863 | The relocations tend to make the kernel binary about 10% larger, |
864 | but are discarded at runtime. | 864 | but are discarded at runtime. |
865 | 865 | ||
866 | One use is for the kexec on panic case where the recovery kernel | 866 | One use is for the kexec on panic case where the recovery kernel |
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu index dce6124cb842..d7f6fb0b30f2 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/i386/Kconfig.cpu | |||
@@ -108,7 +108,7 @@ config MCORE2 | |||
108 | bool "Core 2/newer Xeon" | 108 | bool "Core 2/newer Xeon" |
109 | help | 109 | help |
110 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) | 110 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) |
111 | CPUs. You can distingush newer from older Xeons by the CPU family | 111 | CPUs. You can distinguish newer from older Xeons by the CPU family |
112 | in /proc/cpuinfo. Newer ones have 6. | 112 | in /proc/cpuinfo. Newer ones have 6. |
113 | 113 | ||
114 | config MPENTIUM4 | 114 | config MPENTIUM4 |
@@ -172,7 +172,7 @@ config MWINCHIP3D | |||
172 | help | 172 | help |
173 | Select this for an IDT Winchip-2A or 3. Linux and GCC | 173 | Select this for an IDT Winchip-2A or 3. Linux and GCC |
174 | treat this chip as a 586TSC with some extended instructions | 174 | treat this chip as a 586TSC with some extended instructions |
175 | and alignment reqirements. Also enable out of order memory | 175 | and alignment requirements. Also enable out of order memory |
176 | stores for this CPU, which can increase performance of some | 176 | stores for this CPU, which can increase performance of some |
177 | operations. | 177 | operations. |
178 | 178 | ||
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c index 5b0a040213c2..7ba7c3abd3a4 100644 --- a/arch/i386/kernel/cpu/mcheck/therm_throt.c +++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/i386/kerne/cpu/mcheck/therm_throt.c | 2 | * linux/arch/i386/kernel/cpu/mcheck/therm_throt.c |
3 | * | 3 | * |
4 | * Thermal throttle event support code (such as syslog messaging and rate | 4 | * Thermal throttle event support code (such as syslog messaging and rate |
5 | * limiting) that was factored out from x86_64 (mce_intel.c) and i386 (p4.c). | 5 | * limiting) that was factored out from x86_64 (mce_intel.c) and i386 (p4.c). |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index e23af4b6ae8c..6e41471449c0 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -468,7 +468,7 @@ config KEXEC | |||
468 | help | 468 | help |
469 | kexec is a system call that implements the ability to shutdown your | 469 | kexec is a system call that implements the ability to shutdown your |
470 | current kernel, and to start another kernel. It is like a reboot | 470 | current kernel, and to start another kernel. It is like a reboot |
471 | but it is indepedent of the system firmware. And like a reboot | 471 | but it is independent of the system firmware. And like a reboot |
472 | you can start any kernel with it, not just Linux. | 472 | you can start any kernel with it, not just Linux. |
473 | 473 | ||
474 | The name comes from the similiarity to the exec system call. | 474 | The name comes from the similiarity to the exec system call. |
diff --git a/arch/m68knommu/Kconfig.debug b/arch/m68knommu/Kconfig.debug index 763c9aa0b4fd..9ff47bd09aee 100644 --- a/arch/m68knommu/Kconfig.debug +++ b/arch/m68knommu/Kconfig.debug | |||
@@ -5,7 +5,7 @@ source "lib/Kconfig.debug" | |||
5 | config FULLDEBUG | 5 | config FULLDEBUG |
6 | bool "Full Symbolic/Source Debugging support" | 6 | bool "Full Symbolic/Source Debugging support" |
7 | help | 7 | help |
8 | Enable debuging symbols on kernel build. | 8 | Enable debugging symbols on kernel build. |
9 | 9 | ||
10 | config HIGHPROFILE | 10 | config HIGHPROFILE |
11 | bool "Use fast second timer for profiling" | 11 | bool "Use fast second timer for profiling" |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b7cb048bc771..16ecea3c0813 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -956,7 +956,7 @@ choice | |||
956 | byte order. These modes require different kernels and a different | 956 | byte order. These modes require different kernels and a different |
957 | Linux distribution. In general there is one preferred byteorder for a | 957 | Linux distribution. In general there is one preferred byteorder for a |
958 | particular system but some systems are just as commonly used in the | 958 | particular system but some systems are just as commonly used in the |
959 | one or the other endianess. | 959 | one or the other endianness. |
960 | 960 | ||
961 | config CPU_BIG_ENDIAN | 961 | config CPU_BIG_ENDIAN |
962 | bool "Big endian" | 962 | bool "Big endian" |
@@ -1750,7 +1750,7 @@ config ARCH_DISCONTIGMEM_ENABLE | |||
1750 | bool | 1750 | bool |
1751 | default y if SGI_IP27 | 1751 | default y if SGI_IP27 |
1752 | help | 1752 | help |
1753 | Say Y to upport efficient handling of discontiguous physical memory, | 1753 | Say Y to support efficient handling of discontiguous physical memory, |
1754 | for architectures which are either NUMA (Non-Uniform Memory Access) | 1754 | for architectures which are either NUMA (Non-Uniform Memory Access) |
1755 | or have huge holes in the physical address space for other reasons. | 1755 | or have huge holes in the physical address space for other reasons. |
1756 | See <file:Documentation/vm/numa> for more. | 1756 | See <file:Documentation/vm/numa> for more. |
@@ -1938,7 +1938,7 @@ config KEXEC | |||
1938 | help | 1938 | help |
1939 | kexec is a system call that implements the ability to shutdown your | 1939 | kexec is a system call that implements the ability to shutdown your |
1940 | current kernel, and to start another kernel. It is like a reboot | 1940 | current kernel, and to start another kernel. It is like a reboot |
1941 | but it is indepedent of the system firmware. And like a reboot | 1941 | but it is independent of the system firmware. And like a reboot |
1942 | you can start any kernel with it, not just Linux. | 1942 | you can start any kernel with it, not just Linux. |
1943 | 1943 | ||
1944 | The name comes from the similiarity to the exec system call. | 1944 | The name comes from the similiarity to the exec system call. |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index f2f742df32c7..4892db88a86a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -92,7 +92,7 @@ cflags-y += -ffreestanding | |||
92 | # when fed the toolchain default! | 92 | # when fed the toolchain default! |
93 | # | 93 | # |
94 | # Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of | 94 | # Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of |
95 | # 2006-10-10 don't properly change the the predefined symbols if -EB / -EL | 95 | # 2006-10-10 don't properly change the predefined symbols if -EB / -EL |
96 | # are used, so we kludge that here. A bug has been filed at | 96 | # are used, so we kludge that here. A bug has been filed at |
97 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. | 97 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. |
98 | # | 98 | # |
diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c index 7a7444874e80..0ad39e53f7b1 100644 --- a/arch/mips/pci/fixup-sb1250.c +++ b/arch/mips/pci/fixup-sb1250.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Set the the BCM1250, etc. PCI host bridge's TRDY timeout | 17 | * Set the BCM1250, etc. PCI host bridge's TRDY timeout |
18 | * to the finite max. | 18 | * to the finite max. |
19 | */ | 19 | */ |
20 | static void __init quirk_sb1250_pci(struct pci_dev *dev) | 20 | static void __init quirk_sb1250_pci(struct pci_dev *dev) |
@@ -35,7 +35,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_HT, | |||
35 | quirk_sb1250_ht); | 35 | quirk_sb1250_ht); |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Set the the SP1011 HT/PCI bridge's TRDY timeout to the finite max. | 38 | * Set the SP1011 HT/PCI bridge's TRDY timeout to the finite max. |
39 | */ | 39 | */ |
40 | static void __init quirk_sp1011(struct pci_dev *dev) | 40 | static void __init quirk_sp1011(struct pci_dev *dev) |
41 | { | 41 | { |
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index f70e795c262e..346cd3befe1e 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -32,7 +32,7 @@ config HCALL_STATS | |||
32 | depends on PPC_PSERIES && DEBUG_FS | 32 | depends on PPC_PSERIES && DEBUG_FS |
33 | help | 33 | help |
34 | Adds code to keep track of the number of hypervisor calls made and | 34 | Adds code to keep track of the number of hypervisor calls made and |
35 | the amount of time spent in hypervisor callsr. Wall time spent in | 35 | the amount of time spent in hypervisor calls. Wall time spent in |
36 | each call is always calculated, and if available CPU cycles spent | 36 | each call is always calculated, and if available CPU cycles spent |
37 | are also calculated. A directory named hcall_inst is added at the | 37 | are also calculated. A directory named hcall_inst is added at the |
38 | root of the debugfs filesystem. Within the hcall_inst directory | 38 | root of the debugfs filesystem. Within the hcall_inst directory |
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index 626b29f38304..c29293befba9 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c | |||
@@ -747,7 +747,7 @@ cell_handle_interrupt(struct pt_regs *regs, struct op_counter_config *ctr) | |||
747 | * counter value etc.) are not copied to the actual registers | 747 | * counter value etc.) are not copied to the actual registers |
748 | * until the performance monitor is enabled. In order to get | 748 | * until the performance monitor is enabled. In order to get |
749 | * this to work as desired, the permormance monitor needs to | 749 | * this to work as desired, the permormance monitor needs to |
750 | * be disabled while writting to the latches. This is a | 750 | * be disabled while writing to the latches. This is a |
751 | * HW design issue. | 751 | * HW design issue. |
752 | */ | 752 | */ |
753 | cbe_enable_pm(cpu); | 753 | cbe_enable_pm(cpu); |
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c index a35315af5c53..cf0e7bc8c2e7 100644 --- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /*arch/ppc/platforms/mpc86xads-setup.c | 1 | /*arch/powerpc/platforms/8xx/mpc86xads_setup.c |
2 | * | 2 | * |
3 | * Platform setup for the Freescale mpc86xads board | 3 | * Platform setup for the Freescale mpc86xads board |
4 | * | 4 | * |
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c index a57b57785acd..c36e475d93dc 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /*arch/ppc/platforms/mpc885ads-setup.c | 1 | /*arch/powerpc/platforms/8xx/mpc885ads_setup.c |
2 | * | 2 | * |
3 | * Platform setup for the Freescale mpc885ads board | 3 | * Platform setup for the Freescale mpc885ads board |
4 | * | 4 | * |
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c index d68d920eb2c4..7fb92f23f380 100644 --- a/arch/powerpc/platforms/cell/io-workarounds.c +++ b/arch/powerpc/platforms/cell/io-workarounds.c | |||
@@ -74,7 +74,7 @@ static void spider_io_flush(const volatile void __iomem *addr) | |||
74 | /* Fast path if we have a non-0 token, it indicates which bus we | 74 | /* Fast path if we have a non-0 token, it indicates which bus we |
75 | * are on. | 75 | * are on. |
76 | * | 76 | * |
77 | * If the token is 0, that means either the the ioremap was done | 77 | * If the token is 0, that means either that the ioremap was done |
78 | * before we initialized this layer, or it's a PIO operation. We | 78 | * before we initialized this layer, or it's a PIO operation. We |
79 | * fallback to a low path in this case. Hopefully, internal devices | 79 | * fallback to a low path in this case. Hopefully, internal devices |
80 | * which are ioremap'ed early should use in_XX/out_XX functions | 80 | * which are ioremap'ed early should use in_XX/out_XX functions |
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c index 7ce5364fdb3b..bf72204125c5 100644 --- a/arch/ppc/platforms/mpc866ads_setup.c +++ b/arch/ppc/platforms/mpc866ads_setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /*arch/ppc/platforms/mpc866ads-setup.c | 1 | /*arch/ppc/platforms/mpc866ads_setup.c |
2 | * | 2 | * |
3 | * Platform setup for the Freescale mpc866ads board | 3 | * Platform setup for the Freescale mpc866ads board |
4 | * | 4 | * |
diff --git a/arch/ppc/syslib/ipic.c b/arch/ppc/syslib/ipic.c index 10659c24b1be..9192777d0f78 100644 --- a/arch/ppc/syslib/ipic.c +++ b/arch/ppc/syslib/ipic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-ppc/ipic.c | 2 | * arch/ppc/syslib/ipic.c |
3 | * | 3 | * |
4 | * IPIC routines implementations. | 4 | * IPIC routines implementations. |
5 | * | 5 | * |
diff --git a/arch/s390/crypto/Kconfig b/arch/s390/crypto/Kconfig index 99ff9f08e4d7..d1defbbfcd81 100644 --- a/arch/s390/crypto/Kconfig +++ b/arch/s390/crypto/Kconfig | |||
@@ -54,7 +54,7 @@ config S390_PRNG | |||
54 | default "m" | 54 | default "m" |
55 | help | 55 | help |
56 | Select this option if you want to use the s390 pseudo random number | 56 | Select this option if you want to use the s390 pseudo random number |
57 | generator. The PRNG is part of the cryptograhic processor functions | 57 | generator. The PRNG is part of the cryptographic processor functions |
58 | and uses triple-DES to generate secure random numbers like the | 58 | and uses triple-DES to generate secure random numbers like the |
59 | ANSI X9.17 standard. The PRNG is usable via the char device | 59 | ANSI X9.17 standard. The PRNG is usable via the char device |
60 | /dev/prandom. | 60 | /dev/prandom. |
diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c index 770defed9c4a..52c7bfa57c2c 100644 --- a/arch/sh/boards/se/7751/setup.c +++ b/arch/sh/boards/se/7751/setup.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/sh/kernel/setup_7751se.c | 2 | * linux/arch/sh/boards/se/7751/setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Kazumoto Kojima | 4 | * Copyright (C) 2000 Kazumoto Kojima |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index f3e827f29a46..832c0b4a1e6c 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/entry.S | 2 | * arch/sh/kernel/cpu/sh3/entry.S |
3 | * | 3 | * |
4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
5 | * Copyright (C) 2003 - 2006 Paul Mundt | 5 | * Copyright (C) 2003 - 2006 Paul Mundt |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c index 2fa5cb2ae68d..6d5ba373a75e 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh73180.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh73180.c |
3 | * | 3 | * |
4 | * SH73180 support for the clock framework | 4 | * SH73180 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c index 1707a213f0cf..7adc4f16e95a 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7343.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7343.c |
3 | * | 3 | * |
4 | * SH7343/SH7722 support for the clock framework | 4 | * SH7343/SH7722 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7770.c b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c index c8694bac6477..8e236062c721 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7770.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7770.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7770.c |
3 | * | 3 | * |
4 | * SH7770 support for the clock framework | 4 | * SH7770 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c index 9e6a216750c8..01f3da619d3d 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7780.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7780.c |
3 | * | 3 | * |
4 | * SH7780 support for the clock framework | 4 | * SH7780 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c index 7b0f66f03319..e146bafcd14f 100644 --- a/arch/sh/kernel/vsyscall/vsyscall.c +++ b/arch/sh/kernel/vsyscall/vsyscall.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/vsyscall.c | 2 | * arch/sh/kernel/vsyscall/vsyscall.c |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Paul Mundt | 4 | * Copyright (C) 2006 Paul Mundt |
5 | * | 5 | * |
diff --git a/arch/um/include/sysdep-i386/archsetjmp.h b/arch/um/include/sysdep-i386/archsetjmp.h index 11bafab669e9..0f312085ce1d 100644 --- a/arch/um/include/sysdep-i386/archsetjmp.h +++ b/arch/um/include/sysdep-i386/archsetjmp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/i386/include/klibc/archsetjmp.h | 2 | * arch/um/include/sysdep-i386/archsetjmp.h |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef _KLIBC_ARCHSETJMP_H | 5 | #ifndef _KLIBC_ARCHSETJMP_H |
diff --git a/arch/um/include/sysdep-x86_64/archsetjmp.h b/arch/um/include/sysdep-x86_64/archsetjmp.h index 9a5e1a6ec800..2af8f12ca161 100644 --- a/arch/um/include/sysdep-x86_64/archsetjmp.h +++ b/arch/um/include/sysdep-x86_64/archsetjmp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/x86_64/include/klibc/archsetjmp.h | 2 | * arch/um/include/sysdep-x86_64/archsetjmp.h |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef _KLIBC_ARCHSETJMP_H | 5 | #ifndef _KLIBC_ARCHSETJMP_H |
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S index 8bc521ca081f..e4327a8d6bcd 100644 --- a/arch/v850/kernel/entry.S +++ b/arch/v850/kernel/entry.S | |||
@@ -523,7 +523,7 @@ END(ret_from_trap) | |||
523 | 523 | ||
524 | 524 | ||
525 | /* This the initial entry point for a new child thread, with an appropriate | 525 | /* This the initial entry point for a new child thread, with an appropriate |
526 | stack in place that makes it look the the child is in the middle of an | 526 | stack in place that makes it look that the child is in the middle of an |
527 | syscall. This function is actually `returned to' from switch_thread | 527 | syscall. This function is actually `returned to' from switch_thread |
528 | (copy_thread makes ret_from_fork the return address in each new thread's | 528 | (copy_thread makes ret_from_fork the return address in each new thread's |
529 | saved context). */ | 529 | saved context). */ |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 4d582589fa89..d8bfe315471c 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
@@ -1413,7 +1413,7 @@ static void ack_apic_level(unsigned int irq) | |||
1413 | 1413 | ||
1414 | /* | 1414 | /* |
1415 | * We must acknowledge the irq before we move it or the acknowledge will | 1415 | * We must acknowledge the irq before we move it or the acknowledge will |
1416 | * not propogate properly. | 1416 | * not propagate properly. |
1417 | */ | 1417 | */ |
1418 | ack_APIC_irq(); | 1418 | ack_APIC_irq(); |
1419 | 1419 | ||
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index ca76f071666e..f5319d78c876 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/xtensa/pci-dma.c | 2 | * arch/xtensa/kernel/pci-dma.c |
3 | * | 3 | * |
4 | * DMA coherent memory allocation. | 4 | * DMA coherent memory allocation. |
5 | * | 5 | * |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index cd54672da99f..17e188973428 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -1704,7 +1704,7 @@ EXPORT_SYMBOL(blk_stop_queue); | |||
1704 | * on a queue, such as calling the unplug function after a timeout. | 1704 | * on a queue, such as calling the unplug function after a timeout. |
1705 | * A block device may call blk_sync_queue to ensure that any | 1705 | * A block device may call blk_sync_queue to ensure that any |
1706 | * such activity is cancelled, thus allowing it to release resources | 1706 | * such activity is cancelled, thus allowing it to release resources |
1707 | * the the callbacks might use. The caller must already have made sure | 1707 | * that the callbacks might use. The caller must already have made sure |
1708 | * that its ->make_request_fn will not re-add plugging prior to calling | 1708 | * that its ->make_request_fn will not re-add plugging prior to calling |
1709 | * this function. | 1709 | * this function. |
1710 | * | 1710 | * |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 620e14cabdc6..4ca0ab3448d9 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -271,7 +271,7 @@ config CRYPTO_SERPENT | |||
271 | 271 | ||
272 | Keys are allowed to be from 0 to 256 bits in length, in steps | 272 | Keys are allowed to be from 0 to 256 bits in length, in steps |
273 | of 8 bits. Also includes the 'Tnepres' algorithm, a reversed | 273 | of 8 bits. Also includes the 'Tnepres' algorithm, a reversed |
274 | variant of Serpent for compatibility with old kerneli code. | 274 | variant of Serpent for compatibility with old kerneli.org code. |
275 | 275 | ||
276 | See also: | 276 | See also: |
277 | <http://www.cl.cam.ac.uk/~rja14/serpent.html> | 277 | <http://www.cl.cam.ac.uk/~rja14/serpent.html> |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 45dbdc14915f..c7219663f2b9 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -435,7 +435,7 @@ config PATA_OPTIDMA | |||
435 | help | 435 | help |
436 | This option enables DMA/PIO support for the later OPTi | 436 | This option enables DMA/PIO support for the later OPTi |
437 | controllers found on some old motherboards and in some | 437 | controllers found on some old motherboards and in some |
438 | latops | 438 | laptops. |
439 | 439 | ||
440 | If unsure, say N. | 440 | If unsure, say N. |
441 | 441 | ||
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index e177c9533b6c..e1c0730a3b99 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c | |||
@@ -101,19 +101,6 @@ static void add_dr(struct device *dev, struct devres_node *node) | |||
101 | list_add_tail(&node->entry, &dev->devres_head); | 101 | list_add_tail(&node->entry, &dev->devres_head); |
102 | } | 102 | } |
103 | 103 | ||
104 | /** | ||
105 | * devres_alloc - Allocate device resource data | ||
106 | * @release: Release function devres will be associated with | ||
107 | * @size: Allocation size | ||
108 | * @gfp: Allocation flags | ||
109 | * | ||
110 | * allocate devres of @size bytes. The allocated area is zeroed, then | ||
111 | * associated with @release. The returned pointer can be passed to | ||
112 | * other devres_*() functions. | ||
113 | * | ||
114 | * RETURNS: | ||
115 | * Pointer to allocated devres on success, NULL on failure. | ||
116 | */ | ||
117 | #ifdef CONFIG_DEBUG_DEVRES | 104 | #ifdef CONFIG_DEBUG_DEVRES |
118 | void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, | 105 | void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, |
119 | const char *name) | 106 | const char *name) |
@@ -128,6 +115,19 @@ void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, | |||
128 | } | 115 | } |
129 | EXPORT_SYMBOL_GPL(__devres_alloc); | 116 | EXPORT_SYMBOL_GPL(__devres_alloc); |
130 | #else | 117 | #else |
118 | /** | ||
119 | * devres_alloc - Allocate device resource data | ||
120 | * @release: Release function devres will be associated with | ||
121 | * @size: Allocation size | ||
122 | * @gfp: Allocation flags | ||
123 | * | ||
124 | * Allocate devres of @size bytes. The allocated area is zeroed, then | ||
125 | * associated with @release. The returned pointer can be passed to | ||
126 | * other devres_*() functions. | ||
127 | * | ||
128 | * RETURNS: | ||
129 | * Pointer to allocated devres on success, NULL on failure. | ||
130 | */ | ||
131 | void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp) | 131 | void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp) |
132 | { | 132 | { |
133 | struct devres *dr; | 133 | struct devres *dr; |
@@ -416,7 +416,7 @@ static int release_nodes(struct device *dev, struct list_head *first, | |||
416 | } | 416 | } |
417 | 417 | ||
418 | /** | 418 | /** |
419 | * devres_release_all - Release all resources | 419 | * devres_release_all - Release all managed resources |
420 | * @dev: Device to release resources for | 420 | * @dev: Device to release resources for |
421 | * | 421 | * |
422 | * Release all resources associated with @dev. This function is | 422 | * Release all resources associated with @dev. This function is |
@@ -600,7 +600,7 @@ static int devm_kzalloc_match(struct device *dev, void *res, void *data) | |||
600 | } | 600 | } |
601 | 601 | ||
602 | /** | 602 | /** |
603 | * devm_kzalloc - Managed kzalloc | 603 | * devm_kzalloc - Resource-managed kzalloc |
604 | * @dev: Device to allocate memory for | 604 | * @dev: Device to allocate memory for |
605 | * @size: Allocation size | 605 | * @size: Allocation size |
606 | * @gfp: Allocation gfp flags | 606 | * @gfp: Allocation gfp flags |
@@ -628,7 +628,7 @@ void * devm_kzalloc(struct device *dev, size_t size, gfp_t gfp) | |||
628 | EXPORT_SYMBOL_GPL(devm_kzalloc); | 628 | EXPORT_SYMBOL_GPL(devm_kzalloc); |
629 | 629 | ||
630 | /** | 630 | /** |
631 | * devm_kfree - Managed kfree | 631 | * devm_kfree - Resource-managed kfree |
632 | * @dev: Device this memory belongs to | 632 | * @dev: Device this memory belongs to |
633 | * @p: Memory to free | 633 | * @p: Memory to free |
634 | * | 634 | * |
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index eb84d9d44645..869ff8c00146 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -360,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); | |||
360 | * This function creates a simple platform device that requires minimal | 360 | * This function creates a simple platform device that requires minimal |
361 | * resource and memory management. Canned release function freeing | 361 | * resource and memory management. Canned release function freeing |
362 | * memory allocated for the device allows drivers using such devices | 362 | * memory allocated for the device allows drivers using such devices |
363 | * to be unloaded iwithout waiting for the last reference to the device | 363 | * to be unloaded without waiting for the last reference to the device |
364 | * to be dropped. | 364 | * to be dropped. |
365 | * | 365 | * |
366 | * This interface is primarily intended for use with legacy drivers | 366 | * This interface is primarily intended for use with legacy drivers |
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 43d4ebcb3b44..a1512da32410 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
@@ -151,7 +151,7 @@ static int ramdisk_commit_write(struct file *file, struct page *page, | |||
151 | } | 151 | } |
152 | 152 | ||
153 | /* | 153 | /* |
154 | * ->writepage to the the blockdev's mapping has to redirty the page so that the | 154 | * ->writepage to the blockdev's mapping has to redirty the page so that the |
155 | * VM doesn't go and steal it. We return AOP_WRITEPAGE_ACTIVATE so that the VM | 155 | * VM doesn't go and steal it. We return AOP_WRITEPAGE_ACTIVATE so that the VM |
156 | * won't try to (pointlessly) write the page again for a while. | 156 | * won't try to (pointlessly) write the page again for a while. |
157 | * | 157 | * |
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c index 892db7096986..32ed19c9ec1c 100644 --- a/drivers/char/drm/drm_dma.c +++ b/drivers/char/drm/drm_dma.c | |||
@@ -65,7 +65,7 @@ int drm_dma_setup(drm_device_t * dev) | |||
65 | * \param dev DRM device. | 65 | * \param dev DRM device. |
66 | * | 66 | * |
67 | * Free all pages associated with DMA buffers, the buffers and pages lists, and | 67 | * Free all pages associated with DMA buffers, the buffers and pages lists, and |
68 | * finally the the drm_device::dma structure itself. | 68 | * finally the drm_device::dma structure itself. |
69 | */ | 69 | */ |
70 | void drm_dma_takedown(drm_device_t * dev) | 70 | void drm_dma_takedown(drm_device_t * dev) |
71 | { | 71 | { |
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 35540cfb43dd..b5c5b9fa84c3 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c | |||
@@ -157,7 +157,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, | |||
157 | * \param address access address. | 157 | * \param address access address. |
158 | * \return pointer to the page structure. | 158 | * \return pointer to the page structure. |
159 | * | 159 | * |
160 | * Get the the mapping, find the real physical page to map, get the page, and | 160 | * Get the mapping, find the real physical page to map, get the page, and |
161 | * return it. | 161 | * return it. |
162 | */ | 162 | */ |
163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, | 163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, |
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index a881f96c983e..ecda760ae8c0 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -293,7 +293,7 @@ I am fairly certain that they are correct unless stated otherwise in comments. | |||
293 | # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 | 293 | # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 |
294 | # define R300_PVS_CNTL_1_POS_END_SHIFT 10 | 294 | # define R300_PVS_CNTL_1_POS_END_SHIFT 10 |
295 | # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 | 295 | # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 |
296 | /* Addresses are relative the the vertex program parameters area. */ | 296 | /* Addresses are relative to the vertex program parameters area. */ |
297 | #define R300_VAP_PVS_CNTL_2 0x22D4 | 297 | #define R300_VAP_PVS_CNTL_2 0x22D4 |
298 | # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 | 298 | # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 |
299 | # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 | 299 | # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 |
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index 49f914e79216..9e1fc02967ff 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * | 12 | * |
13 | * This driver allows use of the real time clock (built into | 13 | * This driver allows use of the real time clock (built into |
14 | * nearly all computers) from user space. It exports the /dev/rtc | 14 | * nearly all computers) from user space. It exports the /dev/rtc |
15 | * interface supporting various ioctl() and also the /proc/dev/rtc | 15 | * interface supporting various ioctl() and also the /proc/driver/rtc |
16 | * pseudo-file for status information. | 16 | * pseudo-file for status information. |
17 | * | 17 | * |
18 | * The ioctls can be used to set the interrupt behaviour where | 18 | * The ioctls can be used to set the interrupt behaviour where |
@@ -377,7 +377,7 @@ static int gen_rtc_release(struct inode *inode, struct file *file) | |||
377 | #ifdef CONFIG_PROC_FS | 377 | #ifdef CONFIG_PROC_FS |
378 | 378 | ||
379 | /* | 379 | /* |
380 | * Info exported via "/proc/rtc". | 380 | * Info exported via "/proc/driver/rtc". |
381 | */ | 381 | */ |
382 | 382 | ||
383 | static int gen_rtc_proc_output(char *buf) | 383 | static int gen_rtc_proc_output(char *buf) |
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 561d0e151d0f..fee58e03dbe2 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1091,7 +1091,7 @@ static ssize_t cmm_write(struct file *filp, const char __user *buf, | |||
1091 | /* | 1091 | /* |
1092 | * wait for atr to become valid. | 1092 | * wait for atr to become valid. |
1093 | * note: it is important to lock this code. if we dont, the monitor | 1093 | * note: it is important to lock this code. if we dont, the monitor |
1094 | * could be run between test_bit and the the call the sleep on the | 1094 | * could be run between test_bit and the call to sleep on the |
1095 | * atr-queue. if *then* the monitor detects atr valid, it will wake up | 1095 | * atr-queue. if *then* the monitor detects atr valid, it will wake up |
1096 | * any process on the atr-queue, *but* since we have been interrupted, | 1096 | * any process on the atr-queue, *but* since we have been interrupted, |
1097 | * we do not yet sleep on this queue. this would result in a missed | 1097 | * we do not yet sleep on this queue. this would result in a missed |
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index fe00c7dfb649..11089be0691b 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
@@ -33,7 +33,7 @@ config TCG_NSC | |||
33 | tristate "National Semiconductor TPM Interface" | 33 | tristate "National Semiconductor TPM Interface" |
34 | depends on TCG_TPM && PNPACPI | 34 | depends on TCG_TPM && PNPACPI |
35 | ---help--- | 35 | ---help--- |
36 | If you have a TPM security chip from National Semicondutor | 36 | If you have a TPM security chip from National Semiconductor |
37 | say Yes and it will be accessible from within Linux. To | 37 | say Yes and it will be accessible from within Linux. To |
38 | compile this driver as a module, choose M here; the module | 38 | compile this driver as a module, choose M here; the module |
39 | will be called tpm_nsc. | 39 | will be called tpm_nsc. |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index bf5a00145c0b..fc662e4ce58a 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -1573,11 +1573,11 @@ void no_tty(void) | |||
1573 | 1573 | ||
1574 | 1574 | ||
1575 | /** | 1575 | /** |
1576 | * stop_tty - propogate flow control | 1576 | * stop_tty - propagate flow control |
1577 | * @tty: tty to stop | 1577 | * @tty: tty to stop |
1578 | * | 1578 | * |
1579 | * Perform flow control to the driver. For PTY/TTY pairs we | 1579 | * Perform flow control to the driver. For PTY/TTY pairs we |
1580 | * must also propogate the TIOCKPKT status. May be called | 1580 | * must also propagate the TIOCKPKT status. May be called |
1581 | * on an already stopped device and will not re-call the driver | 1581 | * on an already stopped device and will not re-call the driver |
1582 | * method. | 1582 | * method. |
1583 | * | 1583 | * |
@@ -1607,11 +1607,11 @@ void stop_tty(struct tty_struct *tty) | |||
1607 | EXPORT_SYMBOL(stop_tty); | 1607 | EXPORT_SYMBOL(stop_tty); |
1608 | 1608 | ||
1609 | /** | 1609 | /** |
1610 | * start_tty - propogate flow control | 1610 | * start_tty - propagate flow control |
1611 | * @tty: tty to start | 1611 | * @tty: tty to start |
1612 | * | 1612 | * |
1613 | * Start a tty that has been stopped if at all possible. Perform | 1613 | * Start a tty that has been stopped if at all possible. Perform |
1614 | * any neccessary wakeups and propogate the TIOCPKT status. If this | 1614 | * any neccessary wakeups and propagate the TIOCPKT status. If this |
1615 | * is the tty was previous stopped and is being started then the | 1615 | * is the tty was previous stopped and is being started then the |
1616 | * driver start method is invoked and the line discipline woken. | 1616 | * driver start method is invoked and the line discipline woken. |
1617 | * | 1617 | * |
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index f21fe66c9eef..f4c634504d1a 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
@@ -51,7 +51,7 @@ config CRYPTO_DEV_GEODE | |||
51 | default m | 51 | default m |
52 | help | 52 | help |
53 | Say 'Y' here to use the AMD Geode LX processor on-board AES | 53 | Say 'Y' here to use the AMD Geode LX processor on-board AES |
54 | engine for the CryptoAPI AES alogrithm. | 54 | engine for the CryptoAPI AES algorithm. |
55 | 55 | ||
56 | To compile this driver as a module, choose M here: the module | 56 | To compile this driver as a module, choose M here: the module |
57 | will be called geode-aes. | 57 | will be called geode-aes. |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index c0188de3cc66..79cec50a242f 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -831,7 +831,7 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif) | |||
831 | 831 | ||
832 | /* | 832 | /* |
833 | * Now set up the hw. We have to do this ourselves as | 833 | * Now set up the hw. We have to do this ourselves as |
834 | * the MMIO layout isnt the same as the the standard port | 834 | * the MMIO layout isnt the same as the standard port |
835 | * based I/O | 835 | * based I/O |
836 | */ | 836 | */ |
837 | 837 | ||
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 6a1a0572275e..835937e38529 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
@@ -1702,7 +1702,7 @@ static int nodemgr_host_thread(void *__hi) | |||
1702 | generation = get_hpsb_generation(host); | 1702 | generation = get_hpsb_generation(host); |
1703 | 1703 | ||
1704 | /* If we get a reset before we are done waiting, then | 1704 | /* If we get a reset before we are done waiting, then |
1705 | * start the the waiting over again */ | 1705 | * start the waiting over again */ |
1706 | if (generation != g) | 1706 | if (generation != g) |
1707 | g = generation, i = 0; | 1707 | g = generation, i = 0; |
1708 | } | 1708 | } |
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index c921d6c522f5..c92f9d764fce 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig | |||
@@ -17,7 +17,7 @@ config CAPI_TRACE | |||
17 | help | 17 | help |
18 | If you say Y here, the kernelcapi driver can make verbose traces | 18 | If you say Y here, the kernelcapi driver can make verbose traces |
19 | of CAPI messages. This feature can be enabled/disabled via IOCTL for | 19 | of CAPI messages. This feature can be enabled/disabled via IOCTL for |
20 | every controler (default disabled). | 20 | every controller (default disabled). |
21 | This will increase the size of the kernelcapi module by 20 KB. | 21 | This will increase the size of the kernelcapi module by 20 KB. |
22 | If unsure, say Y. | 22 | If unsure, say Y. |
23 | 23 | ||
diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h index af3eb9e795b5..85784a7ffb25 100644 --- a/drivers/isdn/hardware/eicon/divasync.h +++ b/drivers/isdn/hardware/eicon/divasync.h | |||
@@ -216,7 +216,7 @@ typedef struct | |||
216 | #define SERIAL_HOOK_RING 0x85 | 216 | #define SERIAL_HOOK_RING 0x85 |
217 | #define SERIAL_HOOK_DETACH 0x8f | 217 | #define SERIAL_HOOK_DETACH 0x8f |
218 | unsigned char Flags; /* function refinements */ | 218 | unsigned char Flags; /* function refinements */ |
219 | /* parameters passed by the the ATTACH request */ | 219 | /* parameters passed by the ATTACH request */ |
220 | SERIAL_INT_CB InterruptHandler; /* called on each interrupt */ | 220 | SERIAL_INT_CB InterruptHandler; /* called on each interrupt */ |
221 | SERIAL_DPC_CB DeferredHandler; /* called on hook state changes */ | 221 | SERIAL_DPC_CB DeferredHandler; /* called on hook state changes */ |
222 | void *HandlerContext; /* context for both handlers */ | 222 | void *HandlerContext; /* context for both handlers */ |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 99e70d4103b6..1f18f1993387 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
@@ -1217,11 +1217,11 @@ usb_init(hfcusb_data * hfc) | |||
1217 | /* aux = output, reset off */ | 1217 | /* aux = output, reset off */ |
1218 | write_usb(hfc, HFCUSB_CIRM, 0x10); | 1218 | write_usb(hfc, HFCUSB_CIRM, 0x10); |
1219 | 1219 | ||
1220 | /* set USB_SIZE to match the the wMaxPacketSize for INT or BULK transfers */ | 1220 | /* set USB_SIZE to match the wMaxPacketSize for INT or BULK transfers */ |
1221 | write_usb(hfc, HFCUSB_USB_SIZE, | 1221 | write_usb(hfc, HFCUSB_USB_SIZE, |
1222 | (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4)); | 1222 | (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4)); |
1223 | 1223 | ||
1224 | /* set USB_SIZE_I to match the the wMaxPacketSize for ISO transfers */ | 1224 | /* set USB_SIZE_I to match the wMaxPacketSize for ISO transfers */ |
1225 | write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); | 1225 | write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); |
1226 | 1226 | ||
1227 | /* enable PCM/GCI master mode */ | 1227 | /* enable PCM/GCI master mode */ |
diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c index 1d49d2ade557..677c99325be5 100644 --- a/drivers/leds/leds-h1940.c +++ b/drivers/leds/leds-h1940.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/leds/h1940-leds.c | 2 | * drivers/leds/leds-h1940.c |
3 | * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org> | 3 | * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org> |
4 | * | 4 | * |
5 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index a32c91e27b3c..58926da0ae18 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
@@ -237,7 +237,7 @@ config PMAC_RACKMETER | |||
237 | tristate "Support for Apple XServe front panel LEDs" | 237 | tristate "Support for Apple XServe front panel LEDs" |
238 | depends on PPC_PMAC | 238 | depends on PPC_PMAC |
239 | help | 239 | help |
240 | This driver procides some support to control the front panel | 240 | This driver provides some support to control the front panel |
241 | blue LEDs "vu-meter" of the XServer macs. | 241 | blue LEDs "vu-meter" of the XServer macs. |
242 | 242 | ||
243 | endif # MACINTOSH_DRIVERS | 243 | endif # MACINTOSH_DRIVERS |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c index 68ed3a788083..9200a30dd1b9 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de) | 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de) |
4 | * see dvb-usb-init.c for copyright information. | 4 | * see dvb-usb-init.c for copyright information. |
5 | * | 5 | * |
6 | * This file contains functions for initializing the the input-device and for handling remote-control-queries. | 6 | * This file contains functions for initializing the input-device and for handling remote-control-queries. |
7 | */ | 7 | */ |
8 | #include "dvb-usb-common.h" | 8 | #include "dvb-usb-common.h" |
9 | #include <linux/usb/input.h> | 9 | #include <linux/usb/input.h> |
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index f5d40aa3d27f..f64546c6aeb5 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -266,7 +266,7 @@ static int dib7000m_sad_calib(struct dib7000m_state *state) | |||
266 | { | 266 | { |
267 | 267 | ||
268 | /* internal */ | 268 | /* internal */ |
269 | // dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth | 269 | // dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth |
270 | dib7000m_write_word(state, 929, (0 << 1) | (0 << 0)); | 270 | dib7000m_write_word(state, 929, (0 << 1) | (0 << 0)); |
271 | dib7000m_write_word(state, 930, 776); // 0.625*3.3 / 4096 | 271 | dib7000m_write_word(state, 930, 776); // 0.625*3.3 / 4096 |
272 | 272 | ||
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 0349a4b5da3f..aece458cfe12 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -223,7 +223,7 @@ static int dib7000p_set_bandwidth(struct dvb_frontend *demod, u8 BW_Idx) | |||
223 | static int dib7000p_sad_calib(struct dib7000p_state *state) | 223 | static int dib7000p_sad_calib(struct dib7000p_state *state) |
224 | { | 224 | { |
225 | /* internal */ | 225 | /* internal */ |
226 | // dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth | 226 | // dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth |
227 | dib7000p_write_word(state, 73, (0 << 1) | (0 << 0)); | 227 | dib7000p_write_word(state, 73, (0 << 1) | (0 << 0)); |
228 | dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096 | 228 | dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096 |
229 | 229 | ||
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 110536843e8e..e725f612a6b7 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | TDA10021 - Single Chip Cable Channel Receiver driver module | 2 | TDA10021 - Single Chip Cable Channel Receiver driver module |
3 | used on the the Siemens DVB-C cards | 3 | used on the Siemens DVB-C cards |
4 | 4 | ||
5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> | 5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> |
6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> | 6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> |
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 54d7b07571b8..23fd0303c91b 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c | |||
@@ -306,7 +306,7 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
306 | * The ves1893 sometimes returns sync values that make no sense, | 306 | * The ves1893 sometimes returns sync values that make no sense, |
307 | * because, e.g., the SIGNAL bit is 0, while some of the higher | 307 | * because, e.g., the SIGNAL bit is 0, while some of the higher |
308 | * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?). | 308 | * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?). |
309 | * Tests showed that the the VITERBI and SYNC bits are returned | 309 | * Tests showed that the VITERBI and SYNC bits are returned |
310 | * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong. | 310 | * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong. |
311 | * If such a case occurs, we read the value again, until we get a | 311 | * If such a case occurs, we read the value again, until we get a |
312 | * valid value. | 312 | * valid value. |
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 563a8319e608..54ccc6e1f92e 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -70,7 +70,7 @@ static int em2800_i2c_send_max4(struct em28xx *dev, unsigned char addr, | |||
70 | 70 | ||
71 | ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len); | 71 | ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len); |
72 | if (ret != 2 + len) { | 72 | if (ret != 2 + len) { |
73 | em28xx_warn("writting to i2c device failed (error=%i)\n", ret); | 73 | em28xx_warn("writing to i2c device failed (error=%i)\n", ret); |
74 | return -EIO; | 74 | return -EIO; |
75 | } | 75 | } |
76 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; | 76 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index bec67609500f..2c7b158ce7e1 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1729,7 +1729,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
1729 | 1729 | ||
1730 | endpoint = &interface->cur_altsetting->endpoint[1].desc; | 1730 | endpoint = &interface->cur_altsetting->endpoint[1].desc; |
1731 | 1731 | ||
1732 | /* check if the the device has the iso in endpoint at the correct place */ | 1732 | /* check if the device has the iso in endpoint at the correct place */ |
1733 | if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != | 1733 | if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != |
1734 | USB_ENDPOINT_XFER_ISOC) { | 1734 | USB_ENDPOINT_XFER_ISOC) { |
1735 | em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n"); | 1735 | em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n"); |
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index f5e848410311..f9f3584281d8 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt | |||
@@ -54,9 +54,9 @@ fps | |||
54 | Specifies the desired framerate. Is an integer in the range of 4-30. | 54 | Specifies the desired framerate. Is an integer in the range of 4-30. |
55 | 55 | ||
56 | fbufs | 56 | fbufs |
57 | This paramter specifies the number of internal buffers to use for storing | 57 | This parameter specifies the number of internal buffers to use for storing |
58 | frames from the cam. This will help if the process that reads images from | 58 | frames from the cam. This will help if the process that reads images from |
59 | the cam is a bit slow or momentarely busy. However, on slow machines it | 59 | the cam is a bit slow or momentarily busy. However, on slow machines it |
60 | only introduces lag, so choose carefully. The default is 3, which is | 60 | only introduces lag, so choose carefully. The default is 3, which is |
61 | reasonable. You can set it between 2 and 5. | 61 | reasonable. You can set it between 2 and 5. |
62 | 62 | ||
@@ -209,7 +209,7 @@ trace | |||
209 | 209 | ||
210 | 128 0x80 PWCX debugging Off | 210 | 128 0x80 PWCX debugging Off |
211 | 211 | ||
212 | For example, to trace the open() & read() fuctions, sum 8 + 4 = 12, | 212 | For example, to trace the open() & read() functions, sum 8 + 4 = 12, |
213 | so you would supply trace=12 during insmod or modprobe. If | 213 | so you would supply trace=12 during insmod or modprobe. If |
214 | you want to turn the initialization and probing tracing off, set trace=0. | 214 | you want to turn the initialization and probing tracing off, set trace=0. |
215 | The default value for trace is 35 (0x23). | 215 | The default value for trace is 35 (0x23). |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 876fd2768242..982b115193f8 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * Portions of this code were also copied from usbvideo.c | 29 | * Portions of this code were also copied from usbvideo.c |
30 | * | 30 | * |
31 | * Special thanks to the the whole team at Sourceforge for help making | 31 | * Special thanks to the whole team at Sourceforge for help making |
32 | * this driver become a reality. Notably: | 32 | * this driver become a reality. Notably: |
33 | * Andy Armstrong who reverse engineered the color encoding and | 33 | * Andy Armstrong who reverse engineered the color encoding and |
34 | * Pavel Machek and Chris Cheney who worked on reverse engineering the | 34 | * Pavel Machek and Chris Cheney who worked on reverse engineering the |
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt index d6b4c607453b..ddc7ae029dd3 100644 --- a/drivers/message/fusion/lsi/mpi_history.txt +++ b/drivers/message/fusion/lsi/mpi_history.txt | |||
@@ -571,7 +571,7 @@ mpi_fc.h | |||
571 | * 11-02-00 01.01.01 Original release for post 1.0 work | 571 | * 11-02-00 01.01.01 Original release for post 1.0 work |
572 | * 12-04-00 01.01.02 Added messages for Common Transport Send and | 572 | * 12-04-00 01.01.02 Added messages for Common Transport Send and |
573 | * Primitive Send. | 573 | * Primitive Send. |
574 | * 01-09-01 01.01.03 Modifed some of the new flags to have an MPI prefix | 574 | * 01-09-01 01.01.03 Modified some of the new flags to have an MPI prefix |
575 | * and modified the FcPrimitiveSend flags. | 575 | * and modified the FcPrimitiveSend flags. |
576 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger | 576 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger |
577 | * field. | 577 | * field. |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 97471af4309c..5021d1a2a1d4 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -3585,7 +3585,7 @@ initChainBuffers(MPT_ADAPTER *ioc) | |||
3585 | * index = chain_idx | 3585 | * index = chain_idx |
3586 | * | 3586 | * |
3587 | * Calculate the number of chain buffers needed(plus 1) per I/O | 3587 | * Calculate the number of chain buffers needed(plus 1) per I/O |
3588 | * then multiply the the maximum number of simultaneous cmds | 3588 | * then multiply the maximum number of simultaneous cmds |
3589 | * | 3589 | * |
3590 | * num_sge = num sge in request frame + last chain buffer | 3590 | * num_sge = num sge in request frame + last chain buffer |
3591 | * scale = num sge per chain buffer if no chain element | 3591 | * scale = num sge per chain buffer if no chain element |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index d990d8141ef5..5fcd8b3631ba 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -60,7 +60,7 @@ config MTD_PHYSMAP_BANKWIDTH | |||
60 | (i.e., run-time calling physmap_configure()). | 60 | (i.e., run-time calling physmap_configure()). |
61 | 61 | ||
62 | config MTD_PHYSMAP_OF | 62 | config MTD_PHYSMAP_OF |
63 | tristate "Flash device in physical memory map based on OF descirption" | 63 | tristate "Flash device in physical memory map based on OF description" |
64 | depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) | 64 | depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) |
65 | help | 65 | help |
66 | This provides a 'mapping' driver which allows the NOR Flash and | 66 | This provides a 'mapping' driver which allows the NOR Flash and |
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c index 9f53c655af3a..7b96cd02f82b 100644 --- a/drivers/mtd/maps/nettel.c +++ b/drivers/mtd/maps/nettel.c | |||
@@ -358,7 +358,7 @@ int __init nettel_init(void) | |||
358 | /* Turn other PAR off so the first probe doesn't find it */ | 358 | /* Turn other PAR off so the first probe doesn't find it */ |
359 | *intel1par = 0; | 359 | *intel1par = 0; |
360 | 360 | ||
361 | /* Probe for the the size of the first Intel flash */ | 361 | /* Probe for the size of the first Intel flash */ |
362 | nettel_intel_map.size = maxsize; | 362 | nettel_intel_map.size = maxsize; |
363 | nettel_intel_map.phys = intel0addr; | 363 | nettel_intel_map.phys = intel0addr; |
364 | nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize); | 364 | nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize); |
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 000794c6caf5..0537fac8de74 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c | |||
@@ -2192,7 +2192,7 @@ static int onenand_check_maf(int manuf) | |||
2192 | * @param mtd MTD device structure | 2192 | * @param mtd MTD device structure |
2193 | * | 2193 | * |
2194 | * OneNAND detection method: | 2194 | * OneNAND detection method: |
2195 | * Compare the the values from command with ones from register | 2195 | * Compare the values from command with ones from register |
2196 | */ | 2196 | */ |
2197 | static int onenand_probe(struct mtd_info *mtd) | 2197 | static int onenand_probe(struct mtd_info *mtd) |
2198 | { | 2198 | { |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 9588da3a30e7..127f60841b10 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -95,8 +95,7 @@ static int max_interrupt_work = 10; | |||
95 | #include <asm/io.h> | 95 | #include <asm/io.h> |
96 | #include <asm/irq.h> | 96 | #include <asm/irq.h> |
97 | 97 | ||
98 | static char versionA[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n"; | 98 | static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n"; |
99 | static char versionB[] __initdata = "http://www.scyld.com/network/3c509.html\n"; | ||
100 | 99 | ||
101 | #if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA)) | 100 | #if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA)) |
102 | #define EL3_SUSPEND | 101 | #define EL3_SUSPEND |
@@ -360,7 +359,7 @@ static int __init el3_common_init(struct net_device *dev) | |||
360 | printk(", IRQ %d.\n", dev->irq); | 359 | printk(", IRQ %d.\n", dev->irq); |
361 | 360 | ||
362 | if (el3_debug > 0) | 361 | if (el3_debug > 0) |
363 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 362 | printk(KERN_INFO "%s", version); |
364 | return 0; | 363 | return 0; |
365 | 364 | ||
366 | } | 365 | } |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 80924f76dee8..f26ca331615e 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -103,7 +103,7 @@ static int vortex_debug = 1; | |||
103 | 103 | ||
104 | 104 | ||
105 | static char version[] __devinitdata = | 105 | static char version[] __devinitdata = |
106 | DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n"; | 106 | DRV_NAME ": Donald Becker and others.\n"; |
107 | 107 | ||
108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
109 | MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "); | 109 | MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "); |
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 18aba838c1ff..82d78ff8399b 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -31,10 +31,8 @@ | |||
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | static const char versionA[] = | 34 | static const char version[] = |
35 | "atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n"; | 35 | "atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n"; |
36 | static const char versionB[] = | ||
37 | " http://www.scyld.com/network/atp.html\n"; | ||
38 | 36 | ||
39 | /* The user-configurable values. | 37 | /* The user-configurable values. |
40 | These may be modified when a driver module is loaded.*/ | 38 | These may be modified when a driver module is loaded.*/ |
@@ -324,7 +322,7 @@ static int __init atp_probe1(long ioaddr) | |||
324 | 322 | ||
325 | #ifndef MODULE | 323 | #ifndef MODULE |
326 | if (net_debug) | 324 | if (net_debug) |
327 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 325 | printk(KERN_INFO "%s", version); |
328 | #endif | 326 | #endif |
329 | 327 | ||
330 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM " | 328 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM " |
@@ -926,7 +924,7 @@ static void set_rx_mode_8012(struct net_device *dev) | |||
926 | 924 | ||
927 | static int __init atp_init_module(void) { | 925 | static int __init atp_init_module(void) { |
928 | if (debug) /* Emit version even if no cards detected. */ | 926 | if (debug) /* Emit version even if no cards detected. */ |
929 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 927 | printk(KERN_INFO "%s", version); |
930 | return atp_init(); | 928 | return atp_init(); |
931 | } | 929 | } |
932 | 930 | ||
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 724bce51f936..223517dcbcfd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -3461,7 +3461,7 @@ void bond_unregister_arp(struct bonding *bond) | |||
3461 | /*---------------------------- Hashing Policies -----------------------------*/ | 3461 | /*---------------------------- Hashing Policies -----------------------------*/ |
3462 | 3462 | ||
3463 | /* | 3463 | /* |
3464 | * Hash for the the output device based upon layer 3 and layer 4 data. If | 3464 | * Hash for the output device based upon layer 3 and layer 4 data. If |
3465 | * the packet is a frag or not TCP or UDP, just use layer 3 data. If it is | 3465 | * the packet is a frag or not TCP or UDP, just use layer 3 data. If it is |
3466 | * altogether not IP, mimic bond_xmit_hash_policy_l2() | 3466 | * altogether not IP, mimic bond_xmit_hash_policy_l2() |
3467 | */ | 3467 | */ |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 39654e1e2bed..47680237f783 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1126,7 +1126,7 @@ static void eepro_tx_timeout (struct net_device *dev) | |||
1126 | printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name, | 1126 | printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name, |
1127 | "network cable problem"); | 1127 | "network cable problem"); |
1128 | /* This is not a duplicate. One message for the console, | 1128 | /* This is not a duplicate. One message for the console, |
1129 | one for the the log file */ | 1129 | one for the log file */ |
1130 | printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name, | 1130 | printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name, |
1131 | "network cable problem"); | 1131 | "network cable problem"); |
1132 | eepro_complete_selreset(ioaddr); | 1132 | eepro_complete_selreset(ioaddr); |
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 6c267c38df97..9800341956a2 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | static const char * const version = | 30 | static const char * const version = |
31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n" | 31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker\n" |
32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; | 32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; |
33 | 33 | ||
34 | /* A few user-configurable values that apply to all boards. | 34 | /* A few user-configurable values that apply to all boards. |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 4e3f14c9c717..5e517946f46a 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -93,8 +93,6 @@ static int rx_copybreak; | |||
93 | static char version[] __devinitdata = | 93 | static char version[] __devinitdata = |
94 | DRV_NAME ".c:v1.11 1/7/2001 Written by Donald Becker <becker@scyld.com>\n"; | 94 | DRV_NAME ".c:v1.11 1/7/2001 Written by Donald Becker <becker@scyld.com>\n"; |
95 | static char version2[] __devinitdata = | 95 | static char version2[] __devinitdata = |
96 | " http://www.scyld.com/network/epic100.html\n"; | ||
97 | static char version3[] __devinitdata = | ||
98 | " (unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n"; | 96 | " (unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n"; |
99 | 97 | ||
100 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 98 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
@@ -323,8 +321,8 @@ static int __devinit epic_init_one (struct pci_dev *pdev, | |||
323 | #ifndef MODULE | 321 | #ifndef MODULE |
324 | static int printed_version; | 322 | static int printed_version; |
325 | if (!printed_version++) | 323 | if (!printed_version++) |
326 | printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s", | 324 | printk (KERN_INFO "%s" KERN_INFO "%s", |
327 | version, version2, version3); | 325 | version, version2); |
328 | #endif | 326 | #endif |
329 | 327 | ||
330 | card_idx++; | 328 | card_idx++; |
@@ -1596,8 +1594,8 @@ static int __init epic_init (void) | |||
1596 | { | 1594 | { |
1597 | /* when a module, this is printed whether or not devices are found in probe */ | 1595 | /* when a module, this is printed whether or not devices are found in probe */ |
1598 | #ifdef MODULE | 1596 | #ifdef MODULE |
1599 | printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s", | 1597 | printk (KERN_INFO "%s" KERN_INFO "%s", |
1600 | version, version2, version3); | 1598 | version, version2); |
1601 | #endif | 1599 | #endif |
1602 | 1600 | ||
1603 | return pci_register_driver(&epic_driver); | 1601 | return pci_register_driver(&epic_driver); |
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 6e90619b3b41..36d2c7d4f4d0 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
@@ -140,7 +140,7 @@ config BAYCOM_SER_HDX | |||
140 | modems that connect to a serial interface. The driver supports the | 140 | modems that connect to a serial interface. The driver supports the |
141 | ser12 design in half-duplex mode. This is the old driver. It is | 141 | ser12 design in half-duplex mode. This is the old driver. It is |
142 | still provided in case your serial interface chip does not work with | 142 | still provided in case your serial interface chip does not work with |
143 | the full-duplex driver. This driver is depreciated. To configure | 143 | the full-duplex driver. This driver is deprecated. To configure |
144 | the driver, use the sethdlc utility available in the standard ax25 | 144 | the driver, use the sethdlc utility available in the standard ax25 |
145 | utilities package. For information on the modems, see | 145 | utilities package. For information on the modems, see |
146 | <http://www.baycom.de/> and | 146 | <http://www.baycom.de/> and |
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 2ab173d9a0e4..1e67720f1066 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -113,7 +113,7 @@ | |||
113 | /* RxOver overflow in Recv FIFO */ | 113 | /* RxOver overflow in Recv FIFO */ |
114 | /* SipRcv received serial gap (or other condition you set) */ | 114 | /* SipRcv received serial gap (or other condition you set) */ |
115 | /* Interrupts are enabled by writing a one to the IER register */ | 115 | /* Interrupts are enabled by writing a one to the IER register */ |
116 | /* Interrupts are cleared by writting a one to the ISR register */ | 116 | /* Interrupts are cleared by writing a one to the ISR register */ |
117 | /* */ | 117 | /* */ |
118 | /* 6. The remaining registers: 0x6 and 0x3 appear to be */ | 118 | /* 6. The remaining registers: 0x6 and 0x3 appear to be */ |
119 | /* reserved parts of 16 or 32 bit registersthe remainder */ | 119 | /* reserved parts of 16 or 32 bit registersthe remainder */ |
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c index f15aebde7b90..52c99d01d568 100644 --- a/drivers/net/ixgb/ixgb_ee.c +++ b/drivers/net/ixgb/ixgb_ee.c | |||
@@ -315,7 +315,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw) | |||
315 | * hw - Struct containing variables accessed by shared code | 315 | * hw - Struct containing variables accessed by shared code |
316 | * | 316 | * |
317 | * Reads the first 64 16 bit words of the EEPROM and sums the values read. | 317 | * Reads the first 64 16 bit words of the EEPROM and sums the values read. |
318 | * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is | 318 | * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is |
319 | * valid. | 319 | * valid. |
320 | * | 320 | * |
321 | * Returns: | 321 | * Returns: |
diff --git a/drivers/net/meth.h b/drivers/net/meth.h index 84960dae2a22..ea3b8fc86d1e 100644 --- a/drivers/net/meth.h +++ b/drivers/net/meth.h | |||
@@ -126,7 +126,7 @@ typedef struct rx_packet { | |||
126 | /* Note: when loopback is set this bit becomes collision control. Setting this bit will */ | 126 | /* Note: when loopback is set this bit becomes collision control. Setting this bit will */ |
127 | /* cause a collision to be reported. */ | 127 | /* cause a collision to be reported. */ |
128 | 128 | ||
129 | /* Bits 5 and 6 are used to determine the the Destination address filter mode */ | 129 | /* Bits 5 and 6 are used to determine the Destination address filter mode */ |
130 | #define METH_ACCEPT_MY 0 /* 00: Accept PHY address only */ | 130 | #define METH_ACCEPT_MY 0 /* 00: Accept PHY address only */ |
131 | #define METH_ACCEPT_MCAST 0x20 /* 01: Accept physical, broadcast, and multicast filter matches only */ | 131 | #define METH_ACCEPT_MCAST 0x20 /* 01: Accept physical, broadcast, and multicast filter matches only */ |
132 | #define METH_ACCEPT_AMCAST 0x40 /* 10: Accept physical, broadcast, and all multicast packets */ | 132 | #define METH_ACCEPT_AMCAST 0x40 /* 10: Accept physical, broadcast, and all multicast packets */ |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 223e0e6264ba..4cf0d3fcb519 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -131,7 +131,6 @@ static const char version[] __devinitdata = | |||
131 | KERN_INFO DRV_NAME " dp8381x driver, version " | 131 | KERN_INFO DRV_NAME " dp8381x driver, version " |
132 | DRV_VERSION ", " DRV_RELDATE "\n" | 132 | DRV_VERSION ", " DRV_RELDATE "\n" |
133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" | 133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" |
134 | KERN_INFO " http://www.scyld.com/network/natsemi.html\n" | ||
135 | KERN_INFO " 2.4.x kernel port by Jeff Garzik, Tjeerd Mulder\n"; | 134 | KERN_INFO " 2.4.x kernel port by Jeff Garzik, Tjeerd Mulder\n"; |
136 | 135 | ||
137 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 136 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 589785d1e762..995c0a5d4066 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -63,8 +63,7 @@ static int options[MAX_UNITS]; | |||
63 | 63 | ||
64 | /* These identify the driver base version and may not be removed. */ | 64 | /* These identify the driver base version and may not be removed. */ |
65 | static char version[] __devinitdata = | 65 | static char version[] __devinitdata = |
66 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n" | 66 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n"; |
67 | KERN_INFO " http://www.scyld.com/network/ne2k-pci.html\n"; | ||
68 | 67 | ||
69 | #if defined(__powerpc__) | 68 | #if defined(__powerpc__) |
70 | #define inl_le(addr) le32_to_cpu(inl(addr)) | 69 | #define inl_le(addr) le32_to_cpu(inl(addr)) |
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index f51ba31970aa..e1f912d04043 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -110,8 +110,7 @@ static char *media[MAX_UNITS]; | |||
110 | 110 | ||
111 | /* These identify the driver base version and may not be removed. */ | 111 | /* These identify the driver base version and may not be removed. */ |
112 | static char version[] = | 112 | static char version[] = |
113 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n" | 113 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"; |
114 | KERN_INFO " http://www.scyld.com/network/sundance.html\n"; | ||
115 | 114 | ||
116 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 115 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
117 | MODULE_DESCRIPTION("Sundance Alta Ethernet driver"); | 116 | MODULE_DESCRIPTION("Sundance Alta Ethernet driver"); |
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index 9b08afbd1f65..ea896777bcaf 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
@@ -269,7 +269,7 @@ done: | |||
269 | This would turn on IM for devices that is not contributing | 269 | This would turn on IM for devices that is not contributing |
270 | to backlog congestion with unnecessary latency. | 270 | to backlog congestion with unnecessary latency. |
271 | 271 | ||
272 | We monitor the the device RX-ring and have: | 272 | We monitor the device RX-ring and have: |
273 | 273 | ||
274 | HW Interrupt Mitigation either ON or OFF. | 274 | HW Interrupt Mitigation either ON or OFF. |
275 | 275 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index fa440706fb4a..38f3b99716b8 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1021,7 +1021,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1021 | np->tx_ring[entry].length |= DescEndRing; | 1021 | np->tx_ring[entry].length |= DescEndRing; |
1022 | 1022 | ||
1023 | /* Now acquire the irq spinlock. | 1023 | /* Now acquire the irq spinlock. |
1024 | * The difficult race is the the ordering between | 1024 | * The difficult race is the ordering between |
1025 | * increasing np->cur_tx and setting DescOwned: | 1025 | * increasing np->cur_tx and setting DescOwned: |
1026 | * - if np->cur_tx is increased first the interrupt | 1026 | * - if np->cur_tx is increased first the interrupt |
1027 | * handler could consider the packet as transmitted | 1027 | * handler could consider the packet as transmitted |
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 985a1810ca59..2470b1ee33c0 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -1043,7 +1043,7 @@ static int enable_promisc(struct xircom_private *card) | |||
1043 | 1043 | ||
1044 | 1044 | ||
1045 | /* | 1045 | /* |
1046 | link_status() checks the the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what. | 1046 | link_status() checks the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what. |
1047 | 1047 | ||
1048 | Must be called in locked state with interrupts disabled | 1048 | Must be called in locked state with interrupts disabled |
1049 | */ | 1049 | */ |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index f2dd7763cd0b..f72573594121 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -639,7 +639,7 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd, | |||
639 | 639 | ||
640 | typhoon_inc_cmd_index(&ring->lastWrite, num_cmd); | 640 | typhoon_inc_cmd_index(&ring->lastWrite, num_cmd); |
641 | 641 | ||
642 | /* "I feel a presence... another warrior is on the the mesa." | 642 | /* "I feel a presence... another warrior is on the mesa." |
643 | */ | 643 | */ |
644 | wmb(); | 644 | wmb(); |
645 | iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY); | 645 | iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY); |
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 38fac3bbcd82..7d5b8c2cc614 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c | |||
@@ -149,7 +149,7 @@ static int airport_hard_reset(struct orinoco_private *priv) | |||
149 | /* Vitally important. If we don't do this it seems we get an | 149 | /* Vitally important. If we don't do this it seems we get an |
150 | * interrupt somewhere during the power cycle, since | 150 | * interrupt somewhere during the power cycle, since |
151 | * hw_unavailable is already set it doesn't get ACKed, we get | 151 | * hw_unavailable is already set it doesn't get ACKed, we get |
152 | * into an interrupt loop and the the PMU decides to turn us | 152 | * into an interrupt loop and the PMU decides to turn us |
153 | * off. */ | 153 | * off. */ |
154 | disable_irq(dev->irq); | 154 | disable_irq(dev->irq); |
155 | 155 | ||
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 841b3c136ad9..283be4a70524 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -3054,7 +3054,7 @@ static const iw_handler prism54_handler[] = { | |||
3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ | 3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ |
3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ | 3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ |
3056 | (iw_handler) NULL, /* -- hole -- */ | 3056 | (iw_handler) NULL, /* -- hole -- */ |
3057 | (iw_handler) NULL, /* SIOCGIWAPLIST depreciated */ | 3057 | (iw_handler) NULL, /* SIOCGIWAPLIST deprecated */ |
3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ | 3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ |
3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ | 3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ |
3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ | 3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index a037b11dac9d..084795355b74 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -115,7 +115,7 @@ isl_upload_firmware(islpci_private *priv) | |||
115 | ISL38XX_MEMORY_WINDOW_SIZE : fw_len; | 115 | ISL38XX_MEMORY_WINDOW_SIZE : fw_len; |
116 | u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN; | 116 | u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN; |
117 | 117 | ||
118 | /* set the cards base address for writting the data */ | 118 | /* set the card's base address for writing the data */ |
119 | isl38xx_w32_flush(device_base, reg, | 119 | isl38xx_w32_flush(device_base, reg, |
120 | ISL38XX_DIR_MEM_BASE_REG); | 120 | ISL38XX_DIR_MEM_BASE_REG); |
121 | wmb(); /* be paranoid */ | 121 | wmb(); /* be paranoid */ |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 67b867f837ca..5740d4d4267c 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -176,7 +176,7 @@ psa_write(struct net_device * dev, | |||
176 | volatile u_char __iomem *verify = lp->mem + PSA_ADDR + | 176 | volatile u_char __iomem *verify = lp->mem + PSA_ADDR + |
177 | (psaoff(0, psa_comp_number) << 1); | 177 | (psaoff(0, psa_comp_number) << 1); |
178 | 178 | ||
179 | /* Authorize writting to PSA */ | 179 | /* Authorize writing to PSA */ |
180 | hacr_write(base, HACR_PWR_STAT | HACR_ROM_WEN); | 180 | hacr_write(base, HACR_PWR_STAT | HACR_ROM_WEN); |
181 | 181 | ||
182 | while(n-- > 0) | 182 | while(n-- > 0) |
@@ -1676,7 +1676,7 @@ wv_set_frequency(u_long base, /* i/o port of the card */ | |||
1676 | fee_write(base, 0x60, | 1676 | fee_write(base, 0x60, |
1677 | dac, 2); | 1677 | dac, 2); |
1678 | 1678 | ||
1679 | /* We now should verify here that the EEprom writting was ok */ | 1679 | /* We now should verify here that the EEprom writing was ok */ |
1680 | 1680 | ||
1681 | /* ReRead the first area */ | 1681 | /* ReRead the first area */ |
1682 | fee_read(base, 0x00, | 1682 | fee_read(base, 0x00, |
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index 4d1c4905c749..4b9de0093a7b 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h | |||
@@ -120,7 +120,7 @@ | |||
120 | * the Wavelan itself (NCR -> AT&T -> Lucent). | 120 | * the Wavelan itself (NCR -> AT&T -> Lucent). |
121 | * | 121 | * |
122 | * All started with Anders Klemets <klemets@paul.rutgers.edu>, | 122 | * All started with Anders Klemets <klemets@paul.rutgers.edu>, |
123 | * writting a Wavelan ISA driver for the MACH microkernel. Girish | 123 | * writing a Wavelan ISA driver for the MACH microkernel. Girish |
124 | * Welling <welling@paul.rutgers.edu> had also worked on it. | 124 | * Welling <welling@paul.rutgers.edu> had also worked on it. |
125 | * Keith Moore modify this for the Pcmcia hardware. | 125 | * Keith Moore modify this for the Pcmcia hardware. |
126 | * | 126 | * |
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 3f4a7cf9efea..f2a90a7fa2d6 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -109,7 +109,6 @@ static int gx_fix; | |||
109 | /* These identify the driver base version and may not be removed. */ | 109 | /* These identify the driver base version and may not be removed. */ |
110 | static char version[] __devinitdata = | 110 | static char version[] __devinitdata = |
111 | KERN_INFO DRV_NAME ".c:v1.05 1/09/2001 Written by Donald Becker <becker@scyld.com>\n" | 111 | KERN_INFO DRV_NAME ".c:v1.05 1/09/2001 Written by Donald Becker <becker@scyld.com>\n" |
112 | KERN_INFO " http://www.scyld.com/network/yellowfin.html\n" | ||
113 | KERN_INFO " (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n"; | 112 | KERN_INFO " (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n"; |
114 | 113 | ||
115 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 114 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 3bb7739d26a5..8e58ea3d95c0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -119,7 +119,7 @@ static inline int pci_create_newid_file(struct pci_driver *drv) | |||
119 | * system is in its list of supported devices. Returns the matching | 119 | * system is in its list of supported devices. Returns the matching |
120 | * pci_device_id structure or %NULL if there is no match. | 120 | * pci_device_id structure or %NULL if there is no match. |
121 | * | 121 | * |
122 | * Depreciated, don't use this as it will not catch any dynamic ids | 122 | * Deprecated, don't use this as it will not catch any dynamic ids |
123 | * that a driver might want to check for. | 123 | * that a driver might want to check for. |
124 | */ | 124 | */ |
125 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, | 125 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 5e439836db2d..76422eded36e 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -98,7 +98,7 @@ config RTC_INTF_DEV_UIE_EMUL | |||
98 | bool "RTC UIE emulation on dev interface" | 98 | bool "RTC UIE emulation on dev interface" |
99 | depends on RTC_INTF_DEV | 99 | depends on RTC_INTF_DEV |
100 | help | 100 | help |
101 | Provides an emulation for RTC_UIE if the underlaying rtc chip | 101 | Provides an emulation for RTC_UIE if the underlying rtc chip |
102 | driver does not expose RTC_UIE ioctls. Those requests generate | 102 | driver does not expose RTC_UIE ioctls. Those requests generate |
103 | once-per-second update interrupts, used for synchronization. | 103 | once-per-second update interrupts, used for synchronization. |
104 | 104 | ||
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c index bbd5b8b66f42..d6b06ab81188 100644 --- a/drivers/s390/char/sclp_rw.c +++ b/drivers/s390/char/sclp_rw.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | /* | 24 | /* |
25 | * The room for the SCCB (only for writing) is not equal to a pages size | 25 | * The room for the SCCB (only for writing) is not equal to a pages size |
26 | * (as it is specified as the maximum size in the the SCLP documentation) | 26 | * (as it is specified as the maximum size in the SCLP documentation) |
27 | * because of the additional data structure described above. | 27 | * because of the additional data structure described above. |
28 | */ | 28 | */ |
29 | #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer)) | 29 | #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer)) |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 29d176036e5c..0b96d49dd636 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -2860,7 +2860,7 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int, | |||
2860 | if (!atomic_read(&queue->set_pci_flags_count)){ | 2860 | if (!atomic_read(&queue->set_pci_flags_count)){ |
2861 | /* | 2861 | /* |
2862 | * there's no outstanding PCI any more, so we | 2862 | * there's no outstanding PCI any more, so we |
2863 | * have to request a PCI to be sure the the PCI | 2863 | * have to request a PCI to be sure that the PCI |
2864 | * will wake at some time in the future then we | 2864 | * will wake at some time in the future then we |
2865 | * can flush packed buffers that might still be | 2865 | * can flush packed buffers that might still be |
2866 | * hanging around, which can happen if no | 2866 | * hanging around, which can happen if no |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index cb08ca3cc0f9..bdf5782b8a7a 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
@@ -222,7 +222,7 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, unsigned int status, | |||
222 | * Since we have been using this adapter, it is save to assume | 222 | * Since we have been using this adapter, it is save to assume |
223 | * that it is not failed but recoverable. The card seems to | 223 | * that it is not failed but recoverable. The card seems to |
224 | * report link-up events by self-initiated queue shutdown. | 224 | * report link-up events by self-initiated queue shutdown. |
225 | * That is why we need to clear the the link-down flag | 225 | * That is why we need to clear the link-down flag |
226 | * which is set again in case we have missed by a mile. | 226 | * which is set again in case we have missed by a mile. |
227 | */ | 227 | */ |
228 | zfcp_erp_adapter_reopen( | 228 | zfcp_erp_adapter_reopen( |
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 74b999d77bbf..4fab0c23814c 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c | |||
@@ -156,7 +156,7 @@ static unsigned short get_pins(unsigned minor) | |||
156 | #define BPP_ICR 0x18 | 156 | #define BPP_ICR 0x18 |
157 | #define BPP_SIZE 0x1A | 157 | #define BPP_SIZE 0x1A |
158 | 158 | ||
159 | /* BPP_CSR. Bits of type RW1 are cleared with writting '1'. */ | 159 | /* BPP_CSR. Bits of type RW1 are cleared with writing '1'. */ |
160 | #define P_DEV_ID_MASK 0xf0000000 /* R */ | 160 | #define P_DEV_ID_MASK 0xf0000000 /* R */ |
161 | #define P_DEV_ID_ZEBRA 0x40000000 | 161 | #define P_DEV_ID_ZEBRA 0x40000000 |
162 | #define P_DEV_ID_L64854 0xa0000000 /* == NCR 89C100+89C105. Pity. */ | 162 | #define P_DEV_ID_L64854 0xa0000000 /* == NCR 89C100+89C105. Pity. */ |
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c index 8d72bbae96ad..0bada0028aa0 100644 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c | |||
@@ -966,7 +966,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd) | |||
966 | | AHD_BUSFREEREV_BUG; | 966 | | AHD_BUSFREEREV_BUG; |
967 | ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG; | 967 | ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG; |
968 | 968 | ||
969 | /* If the user requested the the SLOWCRC bit to be set. */ | 969 | /* If the user requested that the SLOWCRC bit to be set. */ |
970 | if (aic79xx_slowcrc) | 970 | if (aic79xx_slowcrc) |
971 | ahd->features |= AHD_AIC79XXB_SLOWCRC; | 971 | ahd->features |= AHD_AIC79XXB_SLOWCRC; |
972 | 972 | ||
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile index e6b70123940c..e78ce0fa44d2 100644 --- a/drivers/scsi/aic94xx/Makefile +++ b/drivers/scsi/aic94xx/Makefile | |||
@@ -6,7 +6,7 @@ | |||
6 | # | 6 | # |
7 | # This file is licensed under GPLv2. | 7 | # This file is licensed under GPLv2. |
8 | # | 8 | # |
9 | # This file is part of the the aic94xx driver. | 9 | # This file is part of the aic94xx driver. |
10 | # | 10 | # |
11 | # The aic94xx driver is free software; you can redistribute it and/or | 11 | # The aic94xx driver is free software; you can redistribute it and/or |
12 | # modify it under the terms of the GNU General Public License as | 12 | # modify it under the terms of the GNU General Public License as |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index a965ed3548d5..564ea90ed3a0 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -541,7 +541,7 @@ static struct ParameterData __devinitdata cfg_data[] = { | |||
541 | 541 | ||
542 | 542 | ||
543 | /* | 543 | /* |
544 | * Safe settings. If set to zero the the BIOS/default values with | 544 | * Safe settings. If set to zero the BIOS/default values with |
545 | * command line overrides will be used. If set to 1 then safe and | 545 | * command line overrides will be used. If set to 1 then safe and |
546 | * slow settings will be used. | 546 | * slow settings will be used. |
547 | */ | 547 | */ |
@@ -617,7 +617,7 @@ static void __devinit fix_settings(void) | |||
617 | 617 | ||
618 | /* | 618 | /* |
619 | * Mapping from the eeprom delay index value (index into this array) | 619 | * Mapping from the eeprom delay index value (index into this array) |
620 | * to the the number of actual seconds that the delay should be for. | 620 | * to the number of actual seconds that the delay should be for. |
621 | */ | 621 | */ |
622 | static char __devinitdata eeprom_index_to_delay_map[] = | 622 | static char __devinitdata eeprom_index_to_delay_map[] = |
623 | { 1, 3, 5, 10, 16, 30, 60, 120 }; | 623 | { 1, 3, 5, 10, 16, 30, 60, 120 }; |
@@ -4136,7 +4136,7 @@ static void __devinit trms1040_write_all(struct NvRamType *eeprom, unsigned long | |||
4136 | * @io_port: base I/O address | 4136 | * @io_port: base I/O address |
4137 | * @addr: offset into SEEPROM | 4137 | * @addr: offset into SEEPROM |
4138 | * | 4138 | * |
4139 | * Returns the the byte read. | 4139 | * Returns the byte read. |
4140 | **/ | 4140 | **/ |
4141 | static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr) | 4141 | static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr) |
4142 | { | 4142 | { |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 61fbcdcbb009..1f5a07bf2a75 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -173,7 +173,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) | |||
173 | * @retries: number of times to retry request | 173 | * @retries: number of times to retry request |
174 | * @flags: or into request flags; | 174 | * @flags: or into request flags; |
175 | * | 175 | * |
176 | * returns the req->errors value which is the the scsi_cmnd result | 176 | * returns the req->errors value which is the scsi_cmnd result |
177 | * field. | 177 | * field. |
178 | **/ | 178 | **/ |
179 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, | 179 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, |
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index b5332e679c46..88fb56d5db8f 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -1307,7 +1307,7 @@ static int auerswald_addservice (pauerswald_t cp, pauerscon_t scp) | |||
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | 1309 | ||
1310 | /* remove a service from the the device | 1310 | /* remove a service from the device |
1311 | scp->id must be set! */ | 1311 | scp->id must be set! */ |
1312 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp) | 1312 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp) |
1313 | { | 1313 | { |
diff --git a/drivers/usb/net/usbnet.h b/drivers/usb/net/usbnet.h index cbb53e065d6c..82db5a8e528e 100644 --- a/drivers/usb/net/usbnet.h +++ b/drivers/usb/net/usbnet.h | |||
@@ -129,7 +129,7 @@ extern void usbnet_disconnect(struct usb_interface *); | |||
129 | 129 | ||
130 | 130 | ||
131 | /* Drivers that reuse some of the standard USB CDC infrastructure | 131 | /* Drivers that reuse some of the standard USB CDC infrastructure |
132 | * (notably, using multiple interfaces according to the the CDC | 132 | * (notably, using multiple interfaces according to the CDC |
133 | * union descriptor) get some helper code. | 133 | * union descriptor) get some helper code. |
134 | */ | 134 | */ |
135 | struct cdc_state { | 135 | struct cdc_state { |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index ba5d1dc03036..3efe67092f15 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -558,7 +558,7 @@ config USB_SERIAL_DEBUG | |||
558 | tristate "USB Debugging Device" | 558 | tristate "USB Debugging Device" |
559 | depends on USB_SERIAL | 559 | depends on USB_SERIAL |
560 | help | 560 | help |
561 | Say Y here if you have a USB debugging device used to recieve | 561 | Say Y here if you have a USB debugging device used to receive |
562 | debugging data from another machine. The most common of these | 562 | debugging data from another machine. The most common of these |
563 | devices is the NetChip TurboCONNECT device. | 563 | devices is the NetChip TurboCONNECT device. |
564 | 564 | ||
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index b675735bfbee..fbc8c27d5d99 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * The device works as an standard CDC device, it has 2 interfaces, the first | 9 | * The device works as an standard CDC device, it has 2 interfaces, the first |
10 | * one is for firmware access and the second is the serial one. | 10 | * one is for firmware access and the second is the serial one. |
11 | * The protocol is very simply, there are two posibilities reading or writing. | 11 | * The protocol is very simply, there are two posibilities reading or writing. |
12 | * When writting the first urb must have a Header that starts with 0x20 0x29 the | 12 | * When writing the first urb must have a Header that starts with 0x20 0x29 the |
13 | * next two bytes must say how much data will be sended. | 13 | * next two bytes must say how much data will be sended. |
14 | * When reading the process is almost equal except that the header starts with | 14 | * When reading the process is almost equal except that the header starts with |
15 | * 0x00 0x20. | 15 | * 0x00 0x20. |
@@ -18,7 +18,7 @@ | |||
18 | * buffer: The First and Second byte is used for a Header, the Third and Fourth | 18 | * buffer: The First and Second byte is used for a Header, the Third and Fourth |
19 | * tells the device the amount of information the package holds. | 19 | * tells the device the amount of information the package holds. |
20 | * Packages are 60 bytes long Header Stuff. | 20 | * Packages are 60 bytes long Header Stuff. |
21 | * When writting to the device the first two bytes of the header are 0x20 0x29 | 21 | * When writing to the device the first two bytes of the header are 0x20 0x29 |
22 | * When reading the bytes are 0x00 0x20, or 0x00 0x10, there is an strange | 22 | * When reading the bytes are 0x00 0x20, or 0x00 0x10, there is an strange |
23 | * situation, when too much data arrives to the device because it sends the data | 23 | * situation, when too much data arrives to the device because it sends the data |
24 | * but with out the header. I will use a simply hack to override this situation, | 24 | * but with out the header. I will use a simply hack to override this situation, |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 18f74ac76565..4807f960150b 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2465,7 +2465,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r | |||
2465 | ((edge_serial->is_epic) && | 2465 | ((edge_serial->is_epic) && |
2466 | (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) && | 2466 | (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) && |
2467 | (regNum == MCR))) { | 2467 | (regNum == MCR))) { |
2468 | dbg("SendCmdWriteUartReg - Not writting to MCR Register"); | 2468 | dbg("SendCmdWriteUartReg - Not writing to MCR Register"); |
2469 | return 0; | 2469 | return 0; |
2470 | } | 2470 | } |
2471 | 2471 | ||
@@ -2473,7 +2473,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r | |||
2473 | ((edge_serial->is_epic) && | 2473 | ((edge_serial->is_epic) && |
2474 | (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) && | 2474 | (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) && |
2475 | (regNum == LCR))) { | 2475 | (regNum == LCR))) { |
2476 | dbg ("SendCmdWriteUartReg - Not writting to LCR Register"); | 2476 | dbg ("SendCmdWriteUartReg - Not writing to LCR Register"); |
2477 | return 0; | 2477 | return 0; |
2478 | } | 2478 | } |
2479 | 2479 | ||
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c index f577bd80e020..03cfb7ac5733 100644 --- a/drivers/video/console/softcursor.c +++ b/drivers/video/console/softcursor.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/video/softcursor.c | 2 | * linux/drivers/video/console/softcursor.c |
3 | * | 3 | * |
4 | * Generic software cursor for frame buffer devices | 4 | * Generic software cursor for frame buffer devices |
5 | * | 5 | * |
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index 7e760197cf29..1a7d7789d877 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
@@ -1717,7 +1717,7 @@ static int __devinit i810_alloc_agp_mem(struct fb_info *info) | |||
1717 | * @info: pointer to device specific info structure | 1717 | * @info: pointer to device specific info structure |
1718 | * | 1718 | * |
1719 | * DESCRIPTION: | 1719 | * DESCRIPTION: |
1720 | * Sets the the user monitor's horizontal and vertical | 1720 | * Sets the user monitor's horizontal and vertical |
1721 | * frequency limits | 1721 | * frequency limits |
1722 | */ | 1722 | */ |
1723 | static void __devinit i810_init_monspecs(struct fb_info *info) | 1723 | static void __devinit i810_init_monspecs(struct fb_info *info) |
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index a5690a5f29d5..9445cdb759b1 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c | |||
@@ -72,7 +72,7 @@ | |||
72 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 72 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
73 | * | 73 | * |
74 | * (following author is not in any relation with this code, but his ideas | 74 | * (following author is not in any relation with this code, but his ideas |
75 | * were used when writting this driver) | 75 | * were used when writing this driver) |
76 | * | 76 | * |
77 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 77 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
78 | * | 78 | * |
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c index a5c825d99466..c57aaadf410c 100644 --- a/drivers/video/matrox/matroxfb_accel.c +++ b/drivers/video/matrox/matroxfb_accel.c | |||
@@ -70,7 +70,7 @@ | |||
70 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 70 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
71 | * | 71 | * |
72 | * (following author is not in any relation with this code, but his ideas | 72 | * (following author is not in any relation with this code, but his ideas |
73 | * were used when writting this driver) | 73 | * were used when writing this driver) |
74 | * | 74 | * |
75 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 75 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
76 | * | 76 | * |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index cb2aa402ddfd..c8559a756b75 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -93,7 +93,7 @@ | |||
93 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 93 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
94 | * | 94 | * |
95 | * (following author is not in any relation with this code, but his ideas | 95 | * (following author is not in any relation with this code, but his ideas |
96 | * were used when writting this driver) | 96 | * were used when writing this driver) |
97 | * | 97 | * |
98 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 98 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
99 | * | 99 | * |
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index 18886b629cb1..5948e54b9ef9 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c | |||
@@ -78,7 +78,7 @@ | |||
78 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 78 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
79 | * | 79 | * |
80 | * (following author is not in any relation with this code, but his ideas | 80 | * (following author is not in any relation with this code, but his ideas |
81 | * were used when writting this driver) | 81 | * were used when writing this driver) |
82 | * | 82 | * |
83 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 83 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
84 | * | 84 | * |
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c index 842b5cd054c6..836a612af977 100644 --- a/drivers/video/skeletonfb.c +++ b/drivers/video/skeletonfb.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * of it. | 14 | * of it. |
15 | * | 15 | * |
16 | * First the roles of struct fb_info and struct display have changed. Struct | 16 | * First the roles of struct fb_info and struct display have changed. Struct |
17 | * display will go away. The way the the new framebuffer console code will | 17 | * display will go away. The way the new framebuffer console code will |
18 | * work is that it will act to translate data about the tty/console in | 18 | * work is that it will act to translate data about the tty/console in |
19 | * struct vc_data to data in a device independent way in struct fb_info. Then | 19 | * struct vc_data to data in a device independent way in struct fb_info. Then |
20 | * various functions in struct fb_ops will be called to store the device | 20 | * various functions in struct fb_ops will be called to store the device |
diff --git a/fs/Kconfig b/fs/Kconfig index 4622dabb2253..0fa0c1193e81 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -724,10 +724,6 @@ config FAT_FS | |||
724 | file system and use GNU tar's M option. GNU tar is a program | 724 | file system and use GNU tar's M option. GNU tar is a program |
725 | available for Unix and DOS ("man tar" or "info tar"). | 725 | available for Unix and DOS ("man tar" or "info tar"). |
726 | 726 | ||
727 | It is now also becoming possible to read and write compressed FAT | ||
728 | file systems; read <file:Documentation/filesystems/fat_cvf.txt> for | ||
729 | details. | ||
730 | |||
731 | The FAT support will enlarge your kernel by about 37 KB. If unsure, | 727 | The FAT support will enlarge your kernel by about 37 KB. If unsure, |
732 | say Y. | 728 | say Y. |
733 | 729 | ||
diff --git a/fs/direct-io.c b/fs/direct-io.c index 8aa2d8b04ef1..8593f3dfd299 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
@@ -439,7 +439,7 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) | |||
439 | * Wait on and process all in-flight BIOs. This must only be called once | 439 | * Wait on and process all in-flight BIOs. This must only be called once |
440 | * all bios have been issued so that the refcount can only decrease. | 440 | * all bios have been issued so that the refcount can only decrease. |
441 | * This just waits for all bios to make it through dio_bio_complete. IO | 441 | * This just waits for all bios to make it through dio_bio_complete. IO |
442 | * errors are propogated through dio->io_error and should be propogated via | 442 | * errors are propagated through dio->io_error and should be propagated via |
443 | * dio_complete(). | 443 | * dio_complete(). |
444 | */ | 444 | */ |
445 | static void dio_await_completion(struct dio *dio) | 445 | static void dio_await_completion(struct dio *dio) |
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index 0208cc7ac5d0..47552d4a6324 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/checkpoint.c | 2 | * linux/fs/jbd/checkpoint.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 |
5 | * | 5 | * |
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index 11563fe2a52b..2a5f4b833e35 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/recovery.c | 2 | * linux/fs/jbd/recovery.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 |
5 | * | 5 | * |
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index a68cbb605022..824e3b7d4ec1 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/revoke.c | 2 | * linux/fs/jbd/revoke.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 2000 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 2000 |
5 | * | 5 | * |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index f9822fc07851..772b6531a2a2 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/transaction.c | 2 | * linux/fs/jbd/transaction.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 |
5 | * | 5 | * |
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 68039fa9a566..3fccde7ba008 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/checkpoint.c | 2 | * linux/fs/jbd2/checkpoint.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 |
5 | * | 5 | * |
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 9f10acafaf70..395c92a04ac9 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/recovery.c | 2 | * linux/fs/jbd2/recovery.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 |
5 | * | 5 | * |
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 1e864dcc49ea..9246e763da78 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/revoke.c | 2 | * linux/fs/jbd2/revoke.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 2000 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 2000 |
5 | * | 5 | * |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index e347d8c078bc..7946ff43fc40 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/transaction.c | 2 | * linux/fs/jbd2/transaction.c |
3 | * | 3 | * |
4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 | 4 | * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 |
5 | * | 5 | * |
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 82b0544bd76d..f3b1ebb22280 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c | |||
@@ -1507,7 +1507,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) | |||
1507 | if (l2nb < budmin) { | 1507 | if (l2nb < budmin) { |
1508 | 1508 | ||
1509 | /* search the lower level dmap control pages to get | 1509 | /* search the lower level dmap control pages to get |
1510 | * the starting block number of the the dmap that | 1510 | * the starting block number of the dmap that |
1511 | * contains or starts off the free space. | 1511 | * contains or starts off the free space. |
1512 | */ | 1512 | */ |
1513 | if ((rc = | 1513 | if ((rc = |
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index c465607be991..c6530227cda6 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c | |||
@@ -386,7 +386,7 @@ int diRead(struct inode *ip) | |||
386 | return -EIO; | 386 | return -EIO; |
387 | } | 387 | } |
388 | 388 | ||
389 | /* locate the the disk inode requested */ | 389 | /* locate the disk inode requested */ |
390 | dp = (struct dinode *) mp->data; | 390 | dp = (struct dinode *) mp->data; |
391 | dp += rel_inode; | 391 | dp += rel_inode; |
392 | 392 | ||
@@ -1407,7 +1407,7 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) | |||
1407 | inum = pip->i_ino + 1; | 1407 | inum = pip->i_ino + 1; |
1408 | ino = inum & (INOSPERIAG - 1); | 1408 | ino = inum & (INOSPERIAG - 1); |
1409 | 1409 | ||
1410 | /* back off the the hint if it is outside of the iag */ | 1410 | /* back off the hint if it is outside of the iag */ |
1411 | if (ino == 0) | 1411 | if (ino == 0) |
1412 | inum = pip->i_ino; | 1412 | inum = pip->i_ino; |
1413 | 1413 | ||
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 6a3f00dc8c83..44a2f33cb98d 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -1960,7 +1960,7 @@ static void lbmfree(struct lbuf * bp) | |||
1960 | /* | 1960 | /* |
1961 | * NAME: lbmRedrive | 1961 | * NAME: lbmRedrive |
1962 | * | 1962 | * |
1963 | * FUNCTION: add a log buffer to the the log redrive list | 1963 | * FUNCTION: add a log buffer to the log redrive list |
1964 | * | 1964 | * |
1965 | * PARAMETER: | 1965 | * PARAMETER: |
1966 | * bp - log buffer | 1966 | * bp - log buffer |
diff --git a/fs/libfs.c b/fs/libfs.c index 1247ee90253a..5294de1f40c4 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
@@ -159,7 +159,10 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
159 | continue; | 159 | continue; |
160 | 160 | ||
161 | spin_unlock(&dcache_lock); | 161 | spin_unlock(&dcache_lock); |
162 | if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0) | 162 | if (filldir(dirent, next->d_name.name, |
163 | next->d_name.len, filp->f_pos, | ||
164 | next->d_inode->i_ino, | ||
165 | dt_type(next->d_inode)) < 0) | ||
163 | return 0; | 166 | return 0; |
164 | spin_lock(&dcache_lock); | 167 | spin_lock(&dcache_lock); |
165 | /* next is still alive */ | 168 | /* next is still alive */ |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index e073fd86cf60..f25086aeef5f 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1110,7 +1110,7 @@ static int flush_commit_list(struct super_block *s, | |||
1110 | if (!barrier) { | 1110 | if (!barrier) { |
1111 | /* If there was a write error in the journal - we can't commit | 1111 | /* If there was a write error in the journal - we can't commit |
1112 | * this transaction - it will be invalid and, if successful, | 1112 | * this transaction - it will be invalid and, if successful, |
1113 | * will just end up propogating the write error out to | 1113 | * will just end up propagating the write error out to |
1114 | * the file system. */ | 1114 | * the file system. */ |
1115 | if (likely(!retval && !reiserfs_is_journal_aborted (journal))) { | 1115 | if (likely(!retval && !reiserfs_is_journal_aborted (journal))) { |
1116 | if (buffer_dirty(jl->j_commit_bh)) | 1116 | if (buffer_dirty(jl->j_commit_bh)) |
@@ -1125,7 +1125,7 @@ static int flush_commit_list(struct super_block *s, | |||
1125 | 1125 | ||
1126 | /* If there was a write error in the journal - we can't commit this | 1126 | /* If there was a write error in the journal - we can't commit this |
1127 | * transaction - it will be invalid and, if successful, will just end | 1127 | * transaction - it will be invalid and, if successful, will just end |
1128 | * up propogating the write error out to the filesystem. */ | 1128 | * up propagating the write error out to the filesystem. */ |
1129 | if (unlikely(!buffer_uptodate(jl->j_commit_bh))) { | 1129 | if (unlikely(!buffer_uptodate(jl->j_commit_bh))) { |
1130 | #ifdef CONFIG_REISERFS_CHECK | 1130 | #ifdef CONFIG_REISERFS_CHECK |
1131 | reiserfs_warning(s, "journal-615: buffer write failed"); | 1131 | reiserfs_warning(s, "journal-615: buffer write failed"); |
diff --git a/fs/select.c b/fs/select.c index d86224154dec..a974082b0824 100644 --- a/fs/select.c +++ b/fs/select.c | |||
@@ -64,7 +64,7 @@ EXPORT_SYMBOL(poll_initwait); | |||
64 | 64 | ||
65 | static void free_poll_entry(struct poll_table_entry *entry) | 65 | static void free_poll_entry(struct poll_table_entry *entry) |
66 | { | 66 | { |
67 | remove_wait_queue(entry->wait_address,&entry->wait); | 67 | remove_wait_queue(entry->wait_address, &entry->wait); |
68 | fput(entry->filp); | 68 | fput(entry->filp); |
69 | } | 69 | } |
70 | 70 | ||
@@ -128,7 +128,7 @@ static void __pollwait(struct file *filp, wait_queue_head_t *wait_address, | |||
128 | entry->filp = filp; | 128 | entry->filp = filp; |
129 | entry->wait_address = wait_address; | 129 | entry->wait_address = wait_address; |
130 | init_waitqueue_entry(&entry->wait, current); | 130 | init_waitqueue_entry(&entry->wait, current); |
131 | add_wait_queue(wait_address,&entry->wait); | 131 | add_wait_queue(wait_address, &entry->wait); |
132 | } | 132 | } |
133 | 133 | ||
134 | #define FDS_IN(fds, n) (fds->in + n) | 134 | #define FDS_IN(fds, n) (fds->in + n) |
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 7775ddc0b3c6..e725ddd3de5f 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
@@ -809,7 +809,7 @@ xfs_inumbers( | |||
809 | xfs_buf_relse(agbp); | 809 | xfs_buf_relse(agbp); |
810 | agbp = NULL; | 810 | agbp = NULL; |
811 | /* | 811 | /* |
812 | * Move up the the last inode in the current | 812 | * Move up the last inode in the current |
813 | * chunk. The lookup_ge will always get | 813 | * chunk. The lookup_ge will always get |
814 | * us the first inode in the next chunk. | 814 | * us the first inode in the next chunk. |
815 | */ | 815 | */ |
diff --git a/include/asm-arm/arch-imx/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h index de6494a4dc6b..30de404c61f5 100644 --- a/include/asm-arm/arch-imx/imx-regs.h +++ b/include/asm-arm/arch-imx/imx-regs.h | |||
@@ -297,7 +297,7 @@ | |||
297 | #define SAR(x) __REG2( IMX_DMAC_BASE + 0x80, (x) << 6) /* Source Address Registers */ | 297 | #define SAR(x) __REG2( IMX_DMAC_BASE + 0x80, (x) << 6) /* Source Address Registers */ |
298 | #define DAR(x) __REG2( IMX_DMAC_BASE + 0x84, (x) << 6) /* Destination Address Registers */ | 298 | #define DAR(x) __REG2( IMX_DMAC_BASE + 0x84, (x) << 6) /* Destination Address Registers */ |
299 | #define CNTR(x) __REG2( IMX_DMAC_BASE + 0x88, (x) << 6) /* Count Registers */ | 299 | #define CNTR(x) __REG2( IMX_DMAC_BASE + 0x88, (x) << 6) /* Count Registers */ |
300 | #define CCR(x) __REG2( IMX_DMAC_BASE + 0x8c, (x) << 6) /* Control Registers */ | 300 | #define CCR(x) __REG2( IMX_DMAC_BASE + 0x8c, (x) << 6) /* Control Registers */ |
301 | #define RSSR(x) __REG2( IMX_DMAC_BASE + 0x90, (x) << 6) /* Request source select Registers */ | 301 | #define RSSR(x) __REG2( IMX_DMAC_BASE + 0x90, (x) << 6) /* Request source select Registers */ |
302 | #define BLR(x) __REG2( IMX_DMAC_BASE + 0x94, (x) << 6) /* Burst length Registers */ | 302 | #define BLR(x) __REG2( IMX_DMAC_BASE + 0x94, (x) << 6) /* Burst length Registers */ |
303 | #define RTOR(x) __REG2( IMX_DMAC_BASE + 0x98, (x) << 6) /* Request timeout Registers */ | 303 | #define RTOR(x) __REG2( IMX_DMAC_BASE + 0x98, (x) << 6) /* Request timeout Registers */ |
diff --git a/include/asm-arm/arch-integrator/platform.h b/include/asm-arm/arch-integrator/platform.h index 96ad3d2a66d1..83c4c1ceb411 100644 --- a/include/asm-arm/arch-integrator/platform.h +++ b/include/asm-arm/arch-integrator/platform.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * from .s file by awk -f s2h.awk | 17 | * from .s file by awk -f s2h.awk |
18 | */ | 18 | */ |
19 | /************************************************************************** | 19 | /************************************************************************** |
20 | * * Copyright © ARM Limited 1998. All rights reserved. | 20 | * * Copyright © ARM Limited 1998. All rights reserved. |
21 | * ***********************************************************************/ | 21 | * ***********************************************************************/ |
22 | /* ************************************************************************ | 22 | /* ************************************************************************ |
23 | * | 23 | * |
diff --git a/include/asm-arm/arch-iop32x/glantank.h b/include/asm-arm/arch-iop32x/glantank.h index 3b065618dd00..bf0665acc1c1 100644 --- a/include/asm-arm/arch-iop32x/glantank.h +++ b/include/asm-arm/arch-iop32x/glantank.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm/arch-iop32x/glantank.h | 2 | * include/asm-arm/arch-iop32x/glantank.h |
3 | * | 3 | * |
4 | * IO-Data GLAN Tank board registers | 4 | * IO-Data GLAN Tank board registers |
5 | */ | 5 | */ |
diff --git a/include/asm-arm/arch-iop32x/n2100.h b/include/asm-arm/arch-iop32x/n2100.h index fed31a648425..77a8af476629 100644 --- a/include/asm-arm/arch-iop32x/n2100.h +++ b/include/asm-arm/arch-iop32x/n2100.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm/arch-iop32x/n2100.h | 2 | * include/asm-arm/arch-iop32x/n2100.h |
3 | * | 3 | * |
4 | * Thecus N2100 board registers | 4 | * Thecus N2100 board registers |
5 | */ | 5 | */ |
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h index edf1dc6ad919..4fd717e626a2 100644 --- a/include/asm-arm/arch-omap/board.h +++ b/include/asm-arm/arch-omap/board.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * Information structures for board-specific data | 4 | * Information structures for board-specific data |
5 | * | 5 | * |
6 | * Copyright (C) 2004 Nokia Corporation | 6 | * Copyright (C) 2004 Nokia Corporation |
7 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> | 7 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef _OMAP_BOARD_H | 10 | #ifndef _OMAP_BOARD_H |
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h index d591d0585bba..f7774192a41e 100644 --- a/include/asm-arm/arch-omap/dma.h +++ b/include/asm-arm/arch-omap/dma.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/include/asm-arm/arch-omap/dma.h | 2 | * linux/include/asm-arm/arch-omap/dma.h |
3 | * | 3 | * |
4 | * Copyright (C) 2003 Nokia Corporation | 4 | * Copyright (C) 2003 Nokia Corporation |
5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> | 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
diff --git a/include/asm-arm/arch-omap/gpio.h b/include/asm-arm/arch-omap/gpio.h index 590917efc94a..97b397dd7e87 100644 --- a/include/asm-arm/arch-omap/gpio.h +++ b/include/asm-arm/arch-omap/gpio.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2003-2005 Nokia Corporation | 6 | * Copyright (C) 2003-2005 Nokia Corporation |
7 | * | 7 | * |
8 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> | 8 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
diff --git a/include/asm-arm/arch-s3c2410/regs-power.h b/include/asm-arm/arch-s3c2410/regs-power.h index 6c319ea2afac..94ff96505b6a 100644 --- a/include/asm-arm/arch-s3c2410/regs-power.h +++ b/include/asm-arm/arch-s3c2410/regs-power.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm/arch-s3c2410/regs-power.h | 1 | /* linux/include/asm-arm/arch-s3c2410/regs-power.h |
2 | * | 2 | * |
3 | * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> | 3 | * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> |
4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h index ff0536d2de42..cd9e26568f85 100644 --- a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h +++ b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm-arm/arch-s3c2410/regs-clock.h | 1 | /* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h |
2 | * | 2 | * |
3 | * Copyright (c) 2007 Simtec Electronics | 3 | * Copyright (c) 2007 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
diff --git a/include/asm-arm/arch-s3c2410/regs-watchdog.h b/include/asm-arm/arch-s3c2410/regs-watchdog.h index f4fff448c7bd..a9c5d491bdb6 100644 --- a/include/asm-arm/arch-s3c2410/regs-watchdog.h +++ b/include/asm-arm/arch-s3c2410/regs-watchdog.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm/arch-s3c2410/regs-watchdog.h | 1 | /* linux/include/asm-arm/arch-s3c2410/regs-watchdog.h |
2 | * | 2 | * |
3 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> | 3 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> |
4 | * http://www.simtec.co.uk/products/SWLINUX/ | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
diff --git a/include/asm-arm/arch-s3c2410/udc.h b/include/asm-arm/arch-s3c2410/udc.h index e59ec339d614..b8aa6cb69b58 100644 --- a/include/asm-arm/arch-s3c2410/udc.h +++ b/include/asm-arm/arch-s3c2410/udc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm/arch-s3c2410/udc.h | 1 | /* linux/include/asm-arm/arch-s3c2410/udc.h |
2 | * | 2 | * |
3 | * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> | 3 | * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> |
4 | * | 4 | * |
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index abfb75b654c7..c8b5d0db0cf0 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h | |||
@@ -445,7 +445,7 @@ extern void dmabounce_unregister_dev(struct device *); | |||
445 | * | 445 | * |
446 | * The dmabounce routines call this function whenever a dma-mapping | 446 | * The dmabounce routines call this function whenever a dma-mapping |
447 | * is requested to determine whether a given buffer needs to be bounced | 447 | * is requested to determine whether a given buffer needs to be bounced |
448 | * or not. The function must return 0 if the the buffer is OK for | 448 | * or not. The function must return 0 if the buffer is OK for |
449 | * DMA access and 1 if the buffer needs to be bounced. | 449 | * DMA access and 1 if the buffer needs to be bounced. |
450 | * | 450 | * |
451 | */ | 451 | */ |
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h index 2aa033bd0678..a5a7a4d5e09c 100644 --- a/include/asm-arm26/io.h +++ b/include/asm-arm26/io.h | |||
@@ -321,7 +321,7 @@ DECLARE_IO(int,l,"") | |||
321 | 321 | ||
322 | #define mmiowb() | 322 | #define mmiowb() |
323 | 323 | ||
324 | /* the following macro is depreciated */ | 324 | /* the following macro is deprecated */ |
325 | #define ioaddr(port) __ioaddr((port)) | 325 | #define ioaddr(port) __ioaddr((port)) |
326 | 326 | ||
327 | /* | 327 | /* |
diff --git a/include/asm-arm26/memory.h b/include/asm-arm26/memory.h index a65f10b80dfb..7c1e5be39060 100644 --- a/include/asm-arm26/memory.h +++ b/include/asm-arm26/memory.h | |||
@@ -60,7 +60,7 @@ static inline void *phys_to_virt(unsigned long x) | |||
60 | /* | 60 | /* |
61 | * Virtual <-> DMA view memory address translations | 61 | * Virtual <-> DMA view memory address translations |
62 | * Again, these are *only* valid on the kernel direct mapped RAM | 62 | * Again, these are *only* valid on the kernel direct mapped RAM |
63 | * memory. Use of these is *depreciated*. | 63 | * memory. Use of these is *deprecated*. |
64 | */ | 64 | */ |
65 | #define virt_to_bus(x) ((unsigned long)(x)) | 65 | #define virt_to_bus(x) ((unsigned long)(x)) |
66 | #define bus_to_virt(x) ((void *)((unsigned long)(x))) | 66 | #define bus_to_virt(x) ((void *)((unsigned long)(x))) |
@@ -93,7 +93,7 @@ static inline void *phys_to_virt(unsigned long x) | |||
93 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 93 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
94 | 94 | ||
95 | /* | 95 | /* |
96 | * We should really eliminate virt_to_bus() here - it's depreciated. | 96 | * We should really eliminate virt_to_bus() here - it's deprecated. |
97 | */ | 97 | */ |
98 | #define page_to_bus(page) (page_address(page)) | 98 | #define page_to_bus(page) (page_address(page)) |
99 | 99 | ||
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h index 1a867b4e8d53..10fd07c76662 100644 --- a/include/asm-arm26/setup.h +++ b/include/asm-arm26/setup.h | |||
@@ -70,7 +70,7 @@ struct tag_ramdisk { | |||
70 | /* describes where the compressed ramdisk image lives */ | 70 | /* describes where the compressed ramdisk image lives */ |
71 | /* | 71 | /* |
72 | * this one accidentally used virtual addresses - as such, | 72 | * this one accidentally used virtual addresses - as such, |
73 | * its depreciated. | 73 | * it's deprecated. |
74 | */ | 74 | */ |
75 | #define ATAG_INITRD 0x54410005 | 75 | #define ATAG_INITRD 0x54410005 |
76 | 76 | ||
diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h index 78339319ba02..cd8a9641bd66 100644 --- a/include/asm-generic/bitops/atomic.h +++ b/include/asm-generic/bitops/atomic.h | |||
@@ -58,7 +58,7 @@ extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned; | |||
58 | * if you do not require the atomic guarantees. | 58 | * if you do not require the atomic guarantees. |
59 | * | 59 | * |
60 | * Note: there are no guarantees that this function will not be reordered | 60 | * Note: there are no guarantees that this function will not be reordered |
61 | * on non x86 architectures, so if you are writting portable code, | 61 | * on non x86 architectures, so if you are writing portable code, |
62 | * make sure not to rely on its reordering guarantees. | 62 | * make sure not to rely on its reordering guarantees. |
63 | * | 63 | * |
64 | * Note that @nr may be almost arbitrarily large; this function is not | 64 | * Note that @nr may be almost arbitrarily large; this function is not |
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h index 273b50629357..a20fe9822f60 100644 --- a/include/asm-i386/bitops.h +++ b/include/asm-i386/bitops.h | |||
@@ -27,7 +27,7 @@ | |||
27 | * if you do not require the atomic guarantees. | 27 | * if you do not require the atomic guarantees. |
28 | * | 28 | * |
29 | * Note: there are no guarantees that this function will not be reordered | 29 | * Note: there are no guarantees that this function will not be reordered |
30 | * on non x86 architectures, so if you are writting portable code, | 30 | * on non x86 architectures, so if you are writing portable code, |
31 | * make sure not to rely on its reordering guarantees. | 31 | * make sure not to rely on its reordering guarantees. |
32 | * | 32 | * |
33 | * Note that @nr may be almost arbitrarily large; this function is not | 33 | * Note that @nr may be almost arbitrarily large; this function is not |
diff --git a/include/asm-i386/boot.h b/include/asm-i386/boot.h index e7686d0a8413..bd024ab4fe53 100644 --- a/include/asm-i386/boot.h +++ b/include/asm-i386/boot.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define EXTENDED_VGA 0xfffe /* 80x50 mode */ | 12 | #define EXTENDED_VGA 0xfffe /* 80x50 mode */ |
13 | #define ASK_VGA 0xfffd /* ask for it at bootup */ | 13 | #define ASK_VGA 0xfffd /* ask for it at bootup */ |
14 | 14 | ||
15 | /* Physical address where kenrel should be loaded. */ | 15 | /* Physical address where kernel should be loaded. */ |
16 | #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ | 16 | #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ |
17 | + (CONFIG_PHYSICAL_ALIGN - 1)) \ | 17 | + (CONFIG_PHYSICAL_ALIGN - 1)) \ |
18 | & ~(CONFIG_PHYSICAL_ALIGN - 1)) | 18 | & ~(CONFIG_PHYSICAL_ALIGN - 1)) |
diff --git a/include/asm-i386/sync_bitops.h b/include/asm-i386/sync_bitops.h index 7d72351bea75..cbce08a2d135 100644 --- a/include/asm-i386/sync_bitops.h +++ b/include/asm-i386/sync_bitops.h | |||
@@ -24,7 +24,7 @@ | |||
24 | * if you do not require the atomic guarantees. | 24 | * if you do not require the atomic guarantees. |
25 | * | 25 | * |
26 | * Note: there are no guarantees that this function will not be reordered | 26 | * Note: there are no guarantees that this function will not be reordered |
27 | * on non x86 architectures, so if you are writting portable code, | 27 | * on non-x86 architectures, so if you are writing portable code, |
28 | * make sure not to rely on its reordering guarantees. | 28 | * make sure not to rely on its reordering guarantees. |
29 | * | 29 | * |
30 | * Note that @nr may be almost arbitrarily large; this function is not | 30 | * Note that @nr may be almost arbitrarily large; this function is not |
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h index 06cdece35865..f62f5c9abba6 100644 --- a/include/asm-m32r/system.h +++ b/include/asm-m32r/system.h | |||
@@ -136,7 +136,7 @@ extern void __xchg_called_with_bad_pointer(void); | |||
136 | "add3 "reg0", "addr", #0x2000; \n\t" \ | 136 | "add3 "reg0", "addr", #0x2000; \n\t" \ |
137 | "ld "reg0", @"reg0"; \n\t" \ | 137 | "ld "reg0", @"reg0"; \n\t" \ |
138 | "unlock "reg0", @"reg1"; \n\t" | 138 | "unlock "reg0", @"reg1"; \n\t" |
139 | /* FIXME: This workaround code cannot handle kenrel modules | 139 | /* FIXME: This workaround code cannot handle kernel modules |
140 | * correctly under SMP environment. | 140 | * correctly under SMP environment. |
141 | */ | 141 | */ |
142 | #else /* CONFIG_CHIP_M32700_TS1 */ | 142 | #else /* CONFIG_CHIP_M32700_TS1 */ |
diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h index f28acd0fd689..6211363a345f 100644 --- a/include/asm-m68k/atarihw.h +++ b/include/asm-m68k/atarihw.h | |||
@@ -2,7 +2,7 @@ | |||
2 | ** linux/atarihw.h -- This header defines some macros and pointers for | 2 | ** linux/atarihw.h -- This header defines some macros and pointers for |
3 | ** the various Atari custom hardware registers. | 3 | ** the various Atari custom hardware registers. |
4 | ** | 4 | ** |
5 | ** Copyright 1994 by Bj”rn Brauel | 5 | ** Copyright 1994 by Bj”rn Brauel |
6 | ** | 6 | ** |
7 | ** 5/1/94 Roman Hodek: | 7 | ** 5/1/94 Roman Hodek: |
8 | ** Added definitions for TT specific chips. | 8 | ** Added definitions for TT specific chips. |
diff --git a/include/asm-m68k/atariints.h b/include/asm-m68k/atariints.h index 0ed454fc24bb..ce6c445805bd 100644 --- a/include/asm-m68k/atariints.h +++ b/include/asm-m68k/atariints.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | ** atariints.h -- Atari Linux interrupt handling structs and prototypes | 2 | ** atariints.h -- Atari Linux interrupt handling structs and prototypes |
3 | ** | 3 | ** |
4 | ** Copyright 1994 by Bj”rn Brauel | 4 | ** Copyright 1994 by Bj”rn Brauel |
5 | ** | 5 | ** |
6 | ** 5/2/94 Roman Hodek: | 6 | ** 5/2/94 Roman Hodek: |
7 | ** TT interrupt definitions added. | 7 | ** TT interrupt definitions added. |
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index c7c945baf1ee..dbf834f4dac4 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
@@ -254,7 +254,7 @@ extern void free_init_pages(const char *what, | |||
254 | extern char arcs_cmdline[CL_SIZE]; | 254 | extern char arcs_cmdline[CL_SIZE]; |
255 | 255 | ||
256 | /* | 256 | /* |
257 | * Registers a0, a1, a3 and a4 as passed to the kenrel entry by firmware | 257 | * Registers a0, a1, a3 and a4 as passed to the kernel entry by firmware |
258 | */ | 258 | */ |
259 | extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; | 259 | extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; |
260 | 260 | ||
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index d74b2965bb82..6dcd7a811fe1 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h | |||
@@ -64,7 +64,7 @@ struct pci_dev *pci_get_device_by_addr(unsigned long addr); | |||
64 | * eeh_slot_error_detail -- record and EEH error condition to the log | 64 | * eeh_slot_error_detail -- record and EEH error condition to the log |
65 | * @severity: 1 if temporary, 2 if permanent failure. | 65 | * @severity: 1 if temporary, 2 if permanent failure. |
66 | * | 66 | * |
67 | * Obtains the the EEH error details from the RTAS subsystem, | 67 | * Obtains the EEH error details from the RTAS subsystem, |
68 | * and then logs these details with the RTAS error log system. | 68 | * and then logs these details with the RTAS error log system. |
69 | */ | 69 | */ |
70 | void eeh_slot_error_detail (struct pci_dn *pdn, int severity); | 70 | void eeh_slot_error_detail (struct pci_dn *pdn, int severity); |
diff --git a/include/asm-ppc/hydra.h b/include/asm-ppc/hydra.h index 833a8aff2a80..1ad4eed07fbe 100644 --- a/include/asm-ppc/hydra.h +++ b/include/asm-ppc/hydra.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * Macintosh Technology in the Common Hardware Reference Platform | 8 | * Macintosh Technology in the Common Hardware Reference Platform |
9 | * Apple Computer, Inc. | 9 | * Apple Computer, Inc. |
10 | * | 10 | * |
11 | * © Copyright 1995 Apple Computer, Inc. All rights reserved. | 11 | * © Copyright 1995 Apple Computer, Inc. All rights reserved. |
12 | * | 12 | * |
13 | * It's available online from http://chrp.apple.com/MacTech.pdf. | 13 | * It's available online from http://chrp.apple.com/MacTech.pdf. |
14 | * You can obtain paper copies of this book from computer bookstores or by | 14 | * You can obtain paper copies of this book from computer bookstores or by |
diff --git a/include/asm-sh/edosk7705.h b/include/asm-sh/edosk7705.h index a1089a65bc36..5bdc9d9be3de 100644 --- a/include/asm-sh/edosk7705.h +++ b/include/asm-sh/edosk7705.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-sh/edosk7705/io.h | 2 | * include/asm-sh/edosk7705.h |
3 | * | 3 | * |
4 | * Modified version of io_se.h for the EDOSK7705 specific functions. | 4 | * Modified version of io_se.h for the EDOSK7705 specific functions. |
5 | * | 5 | * |
diff --git a/include/asm-sh/snapgear.h b/include/asm-sh/snapgear.h index 6b5e4ddc073a..2d712e72c9e5 100644 --- a/include/asm-sh/snapgear.h +++ b/include/asm-sh/snapgear.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-sh/snapgear/io.h | 2 | * include/asm-sh/snapgear.h |
3 | * | 3 | * |
4 | * Modified version of io_se.h for the snapgear-specific functions. | 4 | * Modified version of io_se.h for the snapgear-specific functions. |
5 | * | 5 | * |
diff --git a/include/asm-xtensa/platform-iss/simcall.h b/include/asm-xtensa/platform-iss/simcall.h index 6acb572759a6..b7952c06a2b7 100644 --- a/include/asm-xtensa/platform-iss/simcall.h +++ b/include/asm-xtensa/platform-iss/simcall.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-xtensa/platform-iss/hardware.h | 2 | * include/asm-xtensa/platform-iss/simcall.h |
3 | * | 3 | * |
4 | * This file is subject to the terms and conditions of the GNU General Public | 4 | * This file is subject to the terms and conditions of the GNU General Public |
5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h index 4395e5206746..7894dd0f3b77 100644 --- a/include/linux/ext3_fs_i.h +++ b/include/linux/ext3_fs_i.h | |||
@@ -54,7 +54,7 @@ struct ext3_block_alloc_info { | |||
54 | /* | 54 | /* |
55 | * Was i_next_alloc_goal in ext3_inode_info | 55 | * Was i_next_alloc_goal in ext3_inode_info |
56 | * is the *physical* companion to i_next_alloc_block. | 56 | * is the *physical* companion to i_next_alloc_block. |
57 | * it the the physical block number of the block which was most-recentl | 57 | * it the physical block number of the block which was most-recentl |
58 | * allocated to this file. This give us the goal (target) for the next | 58 | * allocated to this file. This give us the goal (target) for the next |
59 | * allocation when we detect linearly ascending requests. | 59 | * allocation when we detect linearly ascending requests. |
60 | */ | 60 | */ |
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h index bb42379cb7fd..d5b177e5b395 100644 --- a/include/linux/ext4_fs_i.h +++ b/include/linux/ext4_fs_i.h | |||
@@ -52,7 +52,7 @@ struct ext4_block_alloc_info { | |||
52 | /* | 52 | /* |
53 | * Was i_next_alloc_goal in ext4_inode_info | 53 | * Was i_next_alloc_goal in ext4_inode_info |
54 | * is the *physical* companion to i_next_alloc_block. | 54 | * is the *physical* companion to i_next_alloc_block. |
55 | * it the the physical block number of the block which was most-recentl | 55 | * it the physical block number of the block which was most-recentl |
56 | * allocated to this file. This give us the goal (target) for the next | 56 | * allocated to this file. This give us the goal (target) for the next |
57 | * allocation when we detect linearly ascending requests. | 57 | * allocation when we detect linearly ascending requests. |
58 | */ | 58 | */ |
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h index 80764f40be75..886f5faa08cb 100644 --- a/include/linux/generic_acl.h +++ b/include/linux/generic_acl.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * fs/generic_acl.c | 2 | * include/linux/generic_acl.h |
3 | * | 3 | * |
4 | * (C) 2005 Andreas Gruenbacher <agruen@suse.de> | 4 | * (C) 2005 Andreas Gruenbacher <agruen@suse.de> |
5 | * | 5 | * |
diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h index 9ee0f800592f..111334f5b922 100644 --- a/include/linux/i2c-algo-bit.h +++ b/include/linux/i2c-algo-bit.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
19 | /* ------------------------------------------------------------------------- */ | 19 | /* ------------------------------------------------------------------------- */ |
20 | 20 | ||
21 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even | 21 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even |
22 | Frodo Looijaard <frodol@dds.nl> */ | 22 | Frodo Looijaard <frodol@dds.nl> */ |
23 | 23 | ||
24 | #ifndef _LINUX_I2C_ALGO_BIT_H | 24 | #ifndef _LINUX_I2C_ALGO_BIT_H |
diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h index 994eb86f882c..77afbb60fd11 100644 --- a/include/linux/i2c-algo-pcf.h +++ b/include/linux/i2c-algo-pcf.h | |||
@@ -19,7 +19,7 @@ | |||
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
20 | /* ------------------------------------------------------------------------- */ | 20 | /* ------------------------------------------------------------------------- */ |
21 | 21 | ||
22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even | 22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even |
23 | Frodo Looijaard <frodol@dds.nl> */ | 23 | Frodo Looijaard <frodol@dds.nl> */ |
24 | 24 | ||
25 | #ifndef _LINUX_I2C_ALGO_PCF_H | 25 | #ifndef _LINUX_I2C_ALGO_PCF_H |
diff --git a/include/linux/irda.h b/include/linux/irda.h index 09d8f105a5a8..945ba3110874 100644 --- a/include/linux/irda.h +++ b/include/linux/irda.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/linux/meye.h b/include/linux/meye.h index 11ec45e9a132..39fd9c8ddd4b 100644 --- a/include/linux/meye.h +++ b/include/linux/meye.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net> | 4 | * Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net> |
5 | * | 5 | * |
6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> | 8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> |
9 | * | 9 | * |
diff --git a/include/linux/mount.h b/include/linux/mount.h index dab69afee2fa..6d3047d8c91c 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h | |||
@@ -33,7 +33,7 @@ struct mnt_namespace; | |||
33 | 33 | ||
34 | #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */ | 34 | #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */ |
35 | #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */ | 35 | #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */ |
36 | #define MNT_PNODE_MASK 0x3000 /* propogation flag mask */ | 36 | #define MNT_PNODE_MASK 0x3000 /* propagation flag mask */ |
37 | 37 | ||
38 | struct vfsmount { | 38 | struct vfsmount { |
39 | struct list_head mnt_hash; | 39 | struct list_head mnt_hash; |
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index 0deb842541ac..f9e77d2ee320 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h | |||
@@ -87,10 +87,10 @@ do { \ | |||
87 | * management of their lifetimes must be completely managed by API users. | 87 | * management of their lifetimes must be completely managed by API users. |
88 | * | 88 | * |
89 | * For API usage, in general, | 89 | * For API usage, in general, |
90 | * - any function _modifying_ the the tree or tags (inserting or deleting | 90 | * - any function _modifying_ the tree or tags (inserting or deleting |
91 | * items, setting or clearing tags must exclude other modifications, and | 91 | * items, setting or clearing tags must exclude other modifications, and |
92 | * exclude any functions reading the tree. | 92 | * exclude any functions reading the tree. |
93 | * - any function _reading_ the the tree or tags (looking up items or tags, | 93 | * - any function _reading_ the tree or tags (looking up items or tags, |
94 | * gang lookups) must exclude modifications to the tree, but may occur | 94 | * gang lookups) must exclude modifications to the tree, but may occur |
95 | * concurrently with other readers. | 95 | * concurrently with other readers. |
96 | * | 96 | * |
diff --git a/include/linux/security.h b/include/linux/security.h index 47e82c120f9a..9eb9e0fe0331 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -322,7 +322,7 @@ struct request_sock; | |||
322 | * @dir contains the inode structure of parent of the new file. | 322 | * @dir contains the inode structure of parent of the new file. |
323 | * @dentry contains the dentry structure of the new file. | 323 | * @dentry contains the dentry structure of the new file. |
324 | * @mode contains the mode of the new file. | 324 | * @mode contains the mode of the new file. |
325 | * @dev contains the the device number. | 325 | * @dev contains the device number. |
326 | * Return 0 if permission is granted. | 326 | * Return 0 if permission is granted. |
327 | * @inode_rename: | 327 | * @inode_rename: |
328 | * Check for permission to rename a file or directory. | 328 | * Check for permission to rename a file or directory. |
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h index f56d24734950..34d4b075f7b8 100644 --- a/include/linux/sonypi.h +++ b/include/linux/sonypi.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> | 6 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> |
7 | 7 | ||
8 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 8 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
9 | * | 9 | * |
10 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> | 10 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> |
11 | * | 11 | * |
diff --git a/include/linux/usb.h b/include/linux/usb.h index cfbd2bb8fa2c..94bd38a6d947 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -126,7 +126,7 @@ enum usb_interface_condition { | |||
126 | * Each interface may have alternate settings. The initial configuration | 126 | * Each interface may have alternate settings. The initial configuration |
127 | * of a device sets altsetting 0, but the device driver can change | 127 | * of a device sets altsetting 0, but the device driver can change |
128 | * that setting using usb_set_interface(). Alternate settings are often | 128 | * that setting using usb_set_interface(). Alternate settings are often |
129 | * used to control the the use of periodic endpoints, such as by having | 129 | * used to control the use of periodic endpoints, such as by having |
130 | * different endpoints use different amounts of reserved USB bandwidth. | 130 | * different endpoints use different amounts of reserved USB bandwidth. |
131 | * All standards-conformant USB devices that use isochronous endpoints | 131 | * All standards-conformant USB devices that use isochronous endpoints |
132 | * will use them in non-default settings. | 132 | * will use them in non-default settings. |
diff --git a/include/net/irda/af_irda.h b/include/net/irda/af_irda.h index 7a209f61c482..0df574931522 100644 --- a/include/net/irda/af_irda.h +++ b/include/net/irda/af_irda.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 89fe534045f1..36bee441aa56 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/include/net/irda/iriap.h b/include/net/irda/iriap.h index 2007c5a0a43f..fcc896491a95 100644 --- a/include/net/irda/iriap.h +++ b/include/net/irda/iriap.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/include/net/irda/iriap_event.h b/include/net/irda/iriap_event.h index 4ca3d2071b03..89747f06d9eb 100644 --- a/include/net/irda/iriap_event.h +++ b/include/net/irda/iriap_event.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irias_object.h b/include/net/irda/irias_object.h index c41196b87955..83f78081799c 100644 --- a/include/net/irda/irias_object.h +++ b/include/net/irda/irias_object.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlan_client.h b/include/net/irda/irlan_client.h index 736dabe211e3..fa8455eda280 100644 --- a/include/net/irda/irlan_client.h +++ b/include/net/irda/irlan_client.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h index 9592c374b41d..73cacb3ac16c 100644 --- a/include/net/irda/irlan_common.h +++ b/include/net/irda/irlan_common.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/include/net/irda/irlan_eth.h b/include/net/irda/irlan_eth.h index 9a9b3619d305..0062347600b9 100644 --- a/include/net/irda/irlan_eth.h +++ b/include/net/irda/irlan_eth.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlan_event.h b/include/net/irda/irlan_event.h index b9baac9eb8b6..6d9539f05806 100644 --- a/include/net/irda/irlan_event.h +++ b/include/net/irda/irlan_event.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlan_filter.h b/include/net/irda/irlan_filter.h index 1720539ac2c1..a5a2539485bd 100644 --- a/include/net/irda/irlan_filter.h +++ b/include/net/irda/irlan_filter.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlan_provider.h b/include/net/irda/irlan_provider.h index ca51d5b7c999..92f3b0e1029b 100644 --- a/include/net/irda/irlan_provider.h +++ b/include/net/irda/irlan_provider.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index e77eb88d9226..f0248fb8e196 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index e212b9bc2503..3ffc1d0f93d6 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/include/net/irda/irlmp_event.h b/include/net/irda/irlmp_event.h index 03c6f81a502a..e03ae4ae3963 100644 --- a/include/net/irda/irlmp_event.h +++ b/include/net/irda/irlmp_event.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/include/net/irda/irlmp_frame.h b/include/net/irda/irlmp_frame.h index c463f8bca856..1906eb71422e 100644 --- a/include/net/irda/irlmp_frame.h +++ b/include/net/irda/irlmp_frame.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/include/net/irda/irmod.h b/include/net/irda/irmod.h index 72b446c1e22c..86f0dbb8ee5d 100644 --- a/include/net/irda/irmod.h +++ b/include/net/irda/irmod.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charg. | 22 | * provided "AS-IS" and at no charg. |
23 | * | 23 | * |
diff --git a/include/net/irda/irqueue.h b/include/net/irda/irqueue.h index 335b0ace9665..37f512bd6733 100644 --- a/include/net/irda/irqueue.h +++ b/include/net/irda/irqueue.h | |||
@@ -21,7 +21,7 @@ | |||
21 | * published by the Free Software Foundation; either version 2 of | 21 | * published by the Free Software Foundation; either version 2 of |
22 | * the License, or (at your option) any later version. | 22 | * the License, or (at your option) any later version. |
23 | * | 23 | * |
24 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 24 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
25 | * provide warranty for any of this software. This material is | 25 | * provide warranty for any of this software. This material is |
26 | * provided "AS-IS" and at no charge. | 26 | * provided "AS-IS" and at no charge. |
27 | * | 27 | * |
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index a899e5837be8..cf80c1af5854 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/include/net/irda/parameters.h b/include/net/irda/parameters.h index 3a605d37ddbf..c0d938847bd3 100644 --- a/include/net/irda/parameters.h +++ b/include/net/irda/parameters.h | |||
@@ -26,7 +26,7 @@ | |||
26 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 26 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
27 | * MA 02111-1307 USA | 27 | * MA 02111-1307 USA |
28 | * | 28 | * |
29 | * Michel Dänzer <daenzer@debian.org>, 10/2001 | 29 | * Michel Dänzer <daenzer@debian.org>, 10/2001 |
30 | * - simplify irda_pv_t to avoid endianness issues | 30 | * - simplify irda_pv_t to avoid endianness issues |
31 | * | 31 | * |
32 | ********************************************************************/ | 32 | ********************************************************************/ |
diff --git a/include/net/irda/timer.h b/include/net/irda/timer.h index cb61568547d1..cb2615ccf761 100644 --- a/include/net/irda/timer.h +++ b/include/net/irda/timer.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/include/net/irda/wrapper.h b/include/net/irda/wrapper.h index 98768b3f9e31..2942ad6ab932 100644 --- a/include/net/irda/wrapper.h +++ b/include/net/irda/wrapper.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/init/Kconfig b/init/Kconfig index 4ad6de163238..e63a017c391e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -143,9 +143,7 @@ config POSIX_MQUEUE | |||
143 | queues every message has a priority which decides about succession | 143 | queues every message has a priority which decides about succession |
144 | of receiving it by a process. If you want to compile and run | 144 | of receiving it by a process. If you want to compile and run |
145 | programs written e.g. for Solaris with use of its POSIX message | 145 | programs written e.g. for Solaris with use of its POSIX message |
146 | queues (functions mq_*) say Y here. To use this feature you will | 146 | queues (functions mq_*) say Y here. |
147 | also need mqueue library, available from | ||
148 | <http://www.mat.uni.torun.pl/~wrona/posix_ipc/> | ||
149 | 147 | ||
150 | POSIX message queues are visible as a filesystem called 'mqueue' | 148 | POSIX message queues are visible as a filesystem called 'mqueue' |
151 | and can be mounted somewhere if you want to do filesystem | 149 | and can be mounted somewhere if you want to do filesystem |
@@ -308,7 +306,7 @@ config SYSFS_DEPRECATED | |||
308 | releases. | 306 | releases. |
309 | 307 | ||
310 | If enabled, this option will also move any device structures | 308 | If enabled, this option will also move any device structures |
311 | that belong to a class, back into the /sys/class heirachy, in | 309 | that belong to a class, back into the /sys/class hierarchy, in |
312 | order to support older versions of udev. | 310 | order to support older versions of udev. |
313 | 311 | ||
314 | If you are using a distro that was released in 2006 or later, | 312 | If you are using a distro that was released in 2006 or later, |
diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt index 0b46a5dff4c0..c64ce9c14207 100644 --- a/kernel/Kconfig.preempt +++ b/kernel/Kconfig.preempt | |||
@@ -23,7 +23,7 @@ config PREEMPT_VOLUNTARY | |||
23 | "explicit preemption points" to the kernel code. These new | 23 | "explicit preemption points" to the kernel code. These new |
24 | preemption points have been selected to reduce the maximum | 24 | preemption points have been selected to reduce the maximum |
25 | latency of rescheduling, providing faster application reactions, | 25 | latency of rescheduling, providing faster application reactions, |
26 | at the cost of slighly lower throughput. | 26 | at the cost of slightly lower throughput. |
27 | 27 | ||
28 | This allows reaction to interactive events by allowing a | 28 | This allows reaction to interactive events by allowing a |
29 | low priority process to voluntarily preempt itself even if it | 29 | low priority process to voluntarily preempt itself even if it |
@@ -43,7 +43,7 @@ config PREEMPT | |||
43 | even if it is in kernel mode executing a system call and would | 43 | even if it is in kernel mode executing a system call and would |
44 | otherwise not be about to reach a natural preemption point. | 44 | otherwise not be about to reach a natural preemption point. |
45 | This allows applications to run more 'smoothly' even when the | 45 | This allows applications to run more 'smoothly' even when the |
46 | system is under load, at the cost of slighly lower throughput | 46 | system is under load, at the cost of slightly lower throughput |
47 | and a slight runtime overhead to kernel code. | 47 | and a slight runtime overhead to kernel code. |
48 | 48 | ||
49 | Select this if you are building a kernel for a desktop or | 49 | Select this if you are building a kernel for a desktop or |
diff --git a/kernel/module.c b/kernel/module.c index d36e45477fac..9bd93de01f4a 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -96,9 +96,9 @@ static inline void add_taint_module(struct module *mod, unsigned flag) | |||
96 | mod->taints |= flag; | 96 | mod->taints |= flag; |
97 | } | 97 | } |
98 | 98 | ||
99 | /* A thread that wants to hold a reference to a module only while it | 99 | /* |
100 | * is running can call ths to safely exit. | 100 | * A thread that wants to hold a reference to a module only while it |
101 | * nfsd and lockd use this. | 101 | * is running can call this to safely exit. nfsd and lockd use this. |
102 | */ | 102 | */ |
103 | void __module_put_and_exit(struct module *mod, long code) | 103 | void __module_put_and_exit(struct module *mod, long code) |
104 | { | 104 | { |
@@ -1199,7 +1199,7 @@ static int __unlink_module(void *_mod) | |||
1199 | return 0; | 1199 | return 0; |
1200 | } | 1200 | } |
1201 | 1201 | ||
1202 | /* Free a module, remove from lists, etc (must hold module mutex). */ | 1202 | /* Free a module, remove from lists, etc (must hold module_mutex). */ |
1203 | static void free_module(struct module *mod) | 1203 | static void free_module(struct module *mod) |
1204 | { | 1204 | { |
1205 | /* Delete from various lists */ | 1205 | /* Delete from various lists */ |
@@ -1246,7 +1246,7 @@ EXPORT_SYMBOL_GPL(__symbol_get); | |||
1246 | 1246 | ||
1247 | /* | 1247 | /* |
1248 | * Ensure that an exported symbol [global namespace] does not already exist | 1248 | * Ensure that an exported symbol [global namespace] does not already exist |
1249 | * in the Kernel or in some other modules exported symbol table. | 1249 | * in the kernel or in some other module's exported symbol table. |
1250 | */ | 1250 | */ |
1251 | static int verify_export_symbols(struct module *mod) | 1251 | static int verify_export_symbols(struct module *mod) |
1252 | { | 1252 | { |
diff --git a/kernel/relay.c b/kernel/relay.c index 61a504900eaa..4311101b0ca7 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -310,7 +310,7 @@ static struct rchan_callbacks default_channel_callbacks = { | |||
310 | 310 | ||
311 | /** | 311 | /** |
312 | * wakeup_readers - wake up readers waiting on a channel | 312 | * wakeup_readers - wake up readers waiting on a channel |
313 | * @data: contains the the channel buffer | 313 | * @data: contains the channel buffer |
314 | * | 314 | * |
315 | * This is the timer function used to defer reader waking. | 315 | * This is the timer function used to defer reader waking. |
316 | */ | 316 | */ |
diff --git a/kernel/sys.c b/kernel/sys.c index d4985df21b60..cdb7e9457ba6 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1352,7 +1352,7 @@ asmlinkage long sys_setfsuid(uid_t uid) | |||
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | /* | 1354 | /* |
1355 | * Samma på svenska.. | 1355 | * Samma pÃ¥ svenska.. |
1356 | */ | 1356 | */ |
1357 | asmlinkage long sys_setfsgid(gid_t gid) | 1357 | asmlinkage long sys_setfsgid(gid_t gid) |
1358 | { | 1358 | { |
diff --git a/kernel/wait.c b/kernel/wait.c index 59a82f63275d..444ddbfaefc4 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(remove_wait_queue); | |||
61 | * The spin_unlock() itself is semi-permeable and only protects | 61 | * The spin_unlock() itself is semi-permeable and only protects |
62 | * one way (it only protects stuff inside the critical region and | 62 | * one way (it only protects stuff inside the critical region and |
63 | * stops them from bleeding out - it would still allow subsequent | 63 | * stops them from bleeding out - it would still allow subsequent |
64 | * loads to move into the the critical region). | 64 | * loads to move into the critical region). |
65 | */ | 65 | */ |
66 | void fastcall | 66 | void fastcall |
67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) | 67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) |
@@ -1720,7 +1720,7 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma, | |||
1720 | 1720 | ||
1721 | /* | 1721 | /* |
1722 | * Split a vma into two pieces at address 'addr', a new vma is allocated | 1722 | * Split a vma into two pieces at address 'addr', a new vma is allocated |
1723 | * either for the first part or the the tail. | 1723 | * either for the first part or the tail. |
1724 | */ | 1724 | */ |
1725 | int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, | 1725 | int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, |
1726 | unsigned long addr, int new_below) | 1726 | unsigned long addr, int new_below) |
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 9fbe87c93802..bfa910b6ad25 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -1839,7 +1839,7 @@ static inline int dn_queue_too_long(struct dn_scp *scp, struct sk_buff_head *que | |||
1839 | } | 1839 | } |
1840 | 1840 | ||
1841 | /* | 1841 | /* |
1842 | * The DECnet spec requires the the "routing layer" accepts packets which | 1842 | * The DECnet spec requires that the "routing layer" accepts packets which |
1843 | * are at least 230 bytes in size. This excludes any headers which the NSP | 1843 | * are at least 230 bytes in size. This excludes any headers which the NSP |
1844 | * layer might add, so we always assume that we'll be using the maximal | 1844 | * layer might add, so we always assume that we'll be using the maximal |
1845 | * length header on data packets. The variation in length is due to the | 1845 | * length header on data packets. The variation in length is due to the |
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index e62aee0ec4c5..c68196cc56ab 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -130,7 +130,7 @@ config IP_ROUTE_MULTIPATH_RR | |||
130 | tristate "MULTIPATH: round robin algorithm" | 130 | tristate "MULTIPATH: round robin algorithm" |
131 | depends on IP_ROUTE_MULTIPATH_CACHED | 131 | depends on IP_ROUTE_MULTIPATH_CACHED |
132 | help | 132 | help |
133 | Mulitpath routes are chosen according to Round Robin | 133 | Multipath routes are chosen according to Round Robin |
134 | 134 | ||
135 | config IP_ROUTE_MULTIPATH_RANDOM | 135 | config IP_ROUTE_MULTIPATH_RANDOM |
136 | tristate "MULTIPATH: random algorithm" | 136 | tristate "MULTIPATH: random algorithm" |
@@ -651,7 +651,7 @@ config TCP_MD5SIG | |||
651 | select CRYPTO | 651 | select CRYPTO |
652 | select CRYPTO_MD5 | 652 | select CRYPTO_MD5 |
653 | ---help--- | 653 | ---help--- |
654 | RFC2385 specifices a method of giving MD5 protection to TCP sessions. | 654 | RFC2385 specifies a method of giving MD5 protection to TCP sessions. |
655 | Its main (only?) use is to protect BGP sessions between core routers | 655 | Its main (only?) use is to protect BGP sessions between core routers |
656 | on the Internet. | 656 | on the Internet. |
657 | 657 | ||
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index e1f18489db1d..86a2b52aad38 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c | |||
@@ -629,7 +629,7 @@ doi_walk_return: | |||
629 | * @domain: the domain to add | 629 | * @domain: the domain to add |
630 | * | 630 | * |
631 | * Description: | 631 | * Description: |
632 | * Adds the @domain to the the DOI specified by @doi_def, this function | 632 | * Adds the @domain to the DOI specified by @doi_def, this function |
633 | * should only be called by external functions (i.e. NetLabel). This function | 633 | * should only be called by external functions (i.e. NetLabel). This function |
634 | * does allocate memory. Returns zero on success, negative values on failure. | 634 | * does allocate memory. Returns zero on success, negative values on failure. |
635 | * | 635 | * |
diff --git a/net/ipv4/ipvs/ip_vs_sed.c b/net/ipv4/ipvs/ip_vs_sed.c index ff366f7390d9..dd7c128f9db3 100644 --- a/net/ipv4/ipvs/ip_vs_sed.c +++ b/net/ipv4/ipvs/ip_vs_sed.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * The SED algorithm attempts to minimize each job's expected delay until | 18 | * The SED algorithm attempts to minimize each job's expected delay until |
19 | * completion. The expected delay that the job will experience is | 19 | * completion. The expected delay that the job will experience is |
20 | * (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of | 20 | * (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of |
21 | * jobs on the the ith server and Ui is the fixed service rate (weight) of | 21 | * jobs on the ith server and Ui is the fixed service rate (weight) of |
22 | * the ith server. The SED algorithm adopts a greedy policy that each does | 22 | * the ith server. The SED algorithm adopts a greedy policy that each does |
23 | * what is in its own best interest, i.e. to join the queue which would | 23 | * what is in its own best interest, i.e. to join the queue which would |
24 | * minimize its expected delay of completion. | 24 | * minimize its expected delay of completion. |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 113e0c4c8a92..66026df1cc76 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -983,7 +983,7 @@ int udp_disconnect(struct sock *sk, int flags) | |||
983 | } | 983 | } |
984 | 984 | ||
985 | /* return: | 985 | /* return: |
986 | * 1 if the the UDP system should process it | 986 | * 1 if the UDP system should process it |
987 | * 0 if we should drop this packet | 987 | * 0 if we should drop this packet |
988 | * -1 if it should get processed by xfrm4_rcv_encap | 988 | * -1 if it should get processed by xfrm4_rcv_encap |
989 | */ | 989 | */ |
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index bbe99f842f9f..838b8ddee8c0 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig | |||
@@ -28,7 +28,7 @@ config IP6_NF_QUEUE | |||
28 | packets which enables users to receive the filtered packets | 28 | packets which enables users to receive the filtered packets |
29 | with QUEUE target using libipq. | 29 | with QUEUE target using libipq. |
30 | 30 | ||
31 | THis option enables the old IPv6-only "ip6_queue" implementation | 31 | This option enables the old IPv6-only "ip6_queue" implementation |
32 | which has been obsoleted by the new "nfnetlink_queue" code (see | 32 | which has been obsoleted by the new "nfnetlink_queue" code (see |
33 | CONFIG_NETFILTER_NETLINK_QUEUE). | 33 | CONFIG_NETFILTER_NETLINK_QUEUE). |
34 | 34 | ||
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 7d9fa38b6a7d..6b8a103cf9e6 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -324,7 +324,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) | |||
324 | memset(&laddr, 0, sizeof(laddr)); | 324 | memset(&laddr, 0, sizeof(laddr)); |
325 | memset(&daddr, 0, sizeof(daddr)); | 325 | memset(&daddr, 0, sizeof(daddr)); |
326 | /* | 326 | /* |
327 | * FIXME: check if the the address is multicast, | 327 | * FIXME: check if the address is multicast, |
328 | * only SOCK_DGRAM can do this. | 328 | * only SOCK_DGRAM can do this. |
329 | */ | 329 | */ |
330 | memcpy(laddr.mac, addr->sllc_mac, IFHWADDRLEN); | 330 | memcpy(laddr.mac, addr->sllc_mac, IFHWADDRLEN); |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index ea6211cade0a..a567dae8e5fd 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -197,7 +197,7 @@ config NF_CONNTRACK_PPTP | |||
197 | 197 | ||
198 | Please note that not all PPTP modes of operation are supported yet. | 198 | Please note that not all PPTP modes of operation are supported yet. |
199 | Specifically these limitations exist: | 199 | Specifically these limitations exist: |
200 | - Blindy assumes that control connections are always established | 200 | - Blindly assumes that control connections are always established |
201 | in PNS->PAC direction. This is a violation of RFC2637. | 201 | in PNS->PAC direction. This is a violation of RFC2637. |
202 | - Only supports a single call within each session | 202 | - Only supports a single call within each session |
203 | 203 | ||
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index c31af29a4439..117cbfdb910c 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c | |||
@@ -177,7 +177,7 @@ void nf_conntrack_unexpect_related(struct nf_conntrack_expect *exp) | |||
177 | struct nf_conntrack_expect *i; | 177 | struct nf_conntrack_expect *i; |
178 | 178 | ||
179 | write_lock_bh(&nf_conntrack_lock); | 179 | write_lock_bh(&nf_conntrack_lock); |
180 | /* choose the the oldest expectation to evict */ | 180 | /* choose the oldest expectation to evict */ |
181 | list_for_each_entry_reverse(i, &nf_conntrack_expect_list, list) { | 181 | list_for_each_entry_reverse(i, &nf_conntrack_expect_list, list) { |
182 | if (expect_matches(i, exp) && del_timer(&i->timeout)) { | 182 | if (expect_matches(i, exp) && del_timer(&i->timeout)) { |
183 | nf_ct_unlink_expect(i); | 183 | nf_ct_unlink_expect(i); |
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 83ef411772f4..77fb7b06a9c4 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * This file is part of the SCTP kernel reference Implementation | 4 | * This file is part of the SCTP kernel reference Implementation |
5 | * | 5 | * |
6 | * This file contains the code relating the the chunk abstraction. | 6 | * This file contains the code relating the chunk abstraction. |
7 | * | 7 | * |
8 | * The SCTP reference implementation is free software; | 8 | * The SCTP reference implementation is free software; |
9 | * you can redistribute it and/or modify it under the terms of | 9 | * you can redistribute it and/or modify it under the terms of |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9f1a908776de..83a76ba9d7b3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -2586,7 +2586,7 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, int opt | |||
2586 | * | 2586 | * |
2587 | * 7.1.2 SCTP_ASSOCINFO | 2587 | * 7.1.2 SCTP_ASSOCINFO |
2588 | * | 2588 | * |
2589 | * This option is used to tune the the maximum retransmission attempts | 2589 | * This option is used to tune the maximum retransmission attempts |
2590 | * of the association. | 2590 | * of the association. |
2591 | * Returns an error if the new association retransmission value is | 2591 | * Returns an error if the new association retransmission value is |
2592 | * greater than the sum of the retransmission value of the peer. | 2592 | * greater than the sum of the retransmission value of the peer. |
@@ -4547,7 +4547,7 @@ static int sctp_getsockopt_rtoinfo(struct sock *sk, int len, | |||
4547 | * | 4547 | * |
4548 | * 7.1.2 SCTP_ASSOCINFO | 4548 | * 7.1.2 SCTP_ASSOCINFO |
4549 | * | 4549 | * |
4550 | * This option is used to tune the the maximum retransmission attempts | 4550 | * This option is used to tune the maximum retransmission attempts |
4551 | * of the association. | 4551 | * of the association. |
4552 | * Returns an error if the new association retransmission value is | 4552 | * Returns an error if the new association retransmission value is |
4553 | * greater than the sum of the retransmission value of the peer. | 4553 | * greater than the sum of the retransmission value of the peer. |
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index f5c3808bf85a..af7c5f05c6e1 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c | |||
@@ -64,7 +64,7 @@ int svc_set_client(struct svc_rqst *rqstp) | |||
64 | } | 64 | } |
65 | 65 | ||
66 | /* A request, which was authenticated, has now executed. | 66 | /* A request, which was authenticated, has now executed. |
67 | * Time to finalise the the credentials and verifier | 67 | * Time to finalise the credentials and verifier |
68 | * and release and resources | 68 | * and release and resources |
69 | */ | 69 | */ |
70 | int svc_authorise(struct svc_rqst *rqstp) | 70 | int svc_authorise(struct svc_rqst *rqstp) |
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index d6071cbf13d7..f4d2f68452ba 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c | |||
@@ -211,7 +211,7 @@ void find_export_symbols(char * filename) | |||
211 | * Document all external or internal functions in a file. | 211 | * Document all external or internal functions in a file. |
212 | * Call kernel-doc with following parameters: | 212 | * Call kernel-doc with following parameters: |
213 | * kernel-doc -docbook -nofunction function_name1 filename | 213 | * kernel-doc -docbook -nofunction function_name1 filename |
214 | * function names are obtained from all the the src files | 214 | * function names are obtained from all the src files |
215 | * by find_export_symbols. | 215 | * by find_export_symbols. |
216 | * intfunc uses -nofunction | 216 | * intfunc uses -nofunction |
217 | * extfunc uses -function | 217 | * extfunc uses -function |
diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index 23b51047494e..b32a459c0683 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig | |||
@@ -137,7 +137,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION_MAX | |||
137 | 137 | ||
138 | Examples: | 138 | Examples: |
139 | For the Fedora Core 3 or 4 Linux distributions, enable this option | 139 | For the Fedora Core 3 or 4 Linux distributions, enable this option |
140 | and set the value via the next option. For Fedore Core 5 and later, | 140 | and set the value via the next option. For Fedora Core 5 and later, |
141 | do not enable this option. | 141 | do not enable this option. |
142 | 142 | ||
143 | If you are unsure how to answer this question, answer N. | 143 | If you are unsure how to answer this question, answer N. |
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index b2927523d79d..829ca38b595e 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -146,7 +146,7 @@ config SND_VERBOSE_PROCFS | |||
146 | default y | 146 | default y |
147 | help | 147 | help |
148 | Say Y here to include code for verbose procfs contents (provides | 148 | Say Y here to include code for verbose procfs contents (provides |
149 | usefull information to developers when a problem occurs). On the | 149 | useful information to developers when a problem occurs). On the |
150 | other side, it makes the ALSA subsystem larger. | 150 | other side, it makes the ALSA subsystem larger. |
151 | 151 | ||
152 | config SND_VERBOSE_PRINTK | 152 | config SND_VERBOSE_PRINTK |
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c index 974dd732b149..593a3aac12ce 100644 --- a/sound/oss/es1371.c +++ b/sound/oss/es1371.c | |||
@@ -100,7 +100,7 @@ | |||
100 | * Tjeerd Mulder <tjeerd.mulder@fujitsu-siemens.com> | 100 | * Tjeerd Mulder <tjeerd.mulder@fujitsu-siemens.com> |
101 | * 05.01.2001 0.29 Hopefully updates will not be required anymore when Creative bumps | 101 | * 05.01.2001 0.29 Hopefully updates will not be required anymore when Creative bumps |
102 | * the CT5880 revision. | 102 | * the CT5880 revision. |
103 | * suggested by Stephan Müller <smueller@chronox.de> | 103 | * suggested by Stephan Müller <smueller@chronox.de> |
104 | * 31.01.2001 0.30 Register/Unregister gameport | 104 | * 31.01.2001 0.30 Register/Unregister gameport |
105 | * Fix SETTRIGGER non OSS API conformity | 105 | * Fix SETTRIGGER non OSS API conformity |
106 | * 14.07.2001 0.31 Add list of laptops needing amplifier control | 106 | * 14.07.2001 0.31 Add list of laptops needing amplifier control |
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c index 4af6aafa3d86..36c3ea62086b 100644 --- a/sound/oss/pas2_pcm.c +++ b/sound/oss/pas2_pcm.c | |||
@@ -85,7 +85,7 @@ static int pcm_set_speed(int arg) | |||
85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. | 85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. |
86 | * | 86 | * |
87 | * I cleared bit 5 of these values, since that bit controls the master | 87 | * I cleared bit 5 of these values, since that bit controls the master |
88 | * mute flag. (Olav Wölfelschneider) | 88 | * mute flag. (Olav Wölfelschneider) |
89 | * | 89 | * |
90 | */ | 90 | */ |
91 | #if !defined NO_AUTO_FILTER_SET | 91 | #if !defined NO_AUTO_FILTER_SET |
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index d98d311542ed..3bc1f6e9e4a3 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support | 18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support |
19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support | 19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support |
20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support | 20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support |
21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support | 21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support |
22 | * Muli Ben-Yehuda <mulix@mulix.org> | 22 | * Muli Ben-Yehuda <mulix@mulix.org> |
23 | * | 23 | * |
24 | * | 24 | * |
@@ -89,7 +89,7 @@ | |||
89 | * use set_current_state, properly release resources on failure in | 89 | * use set_current_state, properly release resources on failure in |
90 | * trident_probe, get rid of check_region | 90 | * trident_probe, get rid of check_region |
91 | * v0.14.9c | 91 | * v0.14.9c |
92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> | 92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> |
93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 | 93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 |
94 | * this chip is often found in settop boxes (combined video+audio) | 94 | * this chip is often found in settop boxes (combined video+audio) |
95 | * v0.14.9b | 95 | * v0.14.9b |
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index a9eec2a2357d..3bfb2102fc5d 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -1083,7 +1083,7 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha | |||
1083 | unsigned short val; | 1083 | unsigned short val; |
1084 | snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8)); | 1084 | snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8)); |
1085 | /* Do the read twice due to buffers on some ac97 codecs. | 1085 | /* Do the read twice due to buffers on some ac97 codecs. |
1086 | * e.g. The STAC9704 returns exactly what you wrote the the register | 1086 | * e.g. The STAC9704 returns exactly what you wrote to the register |
1087 | * if you read it immediately. This causes the detect routine to fail. | 1087 | * if you read it immediately. This causes the detect routine to fail. |
1088 | */ | 1088 | */ |
1089 | val = snd_ac97_read(ac97, reg); | 1089 | val = snd_ac97_read(ac97, reg); |
diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h index e65d669af639..e47861ccd6e7 100644 --- a/sound/pci/ice1712/delta.h +++ b/sound/pci/ice1712/delta.h | |||
@@ -63,7 +63,7 @@ extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; | |||
63 | /* look to CS8414 datasheet */ | 63 | /* look to CS8414 datasheet */ |
64 | #define ICE1712_DELTA_SPDIF_OUT_STAT_CLOCK 0x04 | 64 | #define ICE1712_DELTA_SPDIF_OUT_STAT_CLOCK 0x04 |
65 | /* S/PDIF output status clock */ | 65 | /* S/PDIF output status clock */ |
66 | /* (writting on rising edge - 0->1) */ | 66 | /* (writing on rising edge - 0->1) */ |
67 | /* all except Delta44 */ | 67 | /* all except Delta44 */ |
68 | /* look to CS8404A datasheet */ | 68 | /* look to CS8404A datasheet */ |
69 | #define ICE1712_DELTA_SPDIF_OUT_STAT_DATA 0x08 | 69 | #define ICE1712_DELTA_SPDIF_OUT_STAT_DATA 0x08 |
@@ -100,7 +100,7 @@ extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; | |||
100 | /* AKM4524 serial data */ | 100 | /* AKM4524 serial data */ |
101 | #define ICE1712_DELTA_CODEC_SERIAL_CLOCK 0x20 | 101 | #define ICE1712_DELTA_CODEC_SERIAL_CLOCK 0x20 |
102 | /* AKM4524 serial clock */ | 102 | /* AKM4524 serial clock */ |
103 | /* (writting on rising edge - 0->1 */ | 103 | /* (writing on rising edge - 0->1 */ |
104 | #define ICE1712_DELTA_CODEC_CHIP_A 0x40 | 104 | #define ICE1712_DELTA_CODEC_CHIP_A 0x40 |
105 | #define ICE1712_DELTA_CODEC_CHIP_B 0x80 | 105 | #define ICE1712_DELTA_CODEC_CHIP_B 0x80 |
106 | /* 1 - select chip A or B */ | 106 | /* 1 - select chip A or B */ |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 21386da3bc86..ac007cec0879 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -472,7 +472,7 @@ static int snd_mixart_prepare(struct snd_pcm_substream *subs) | |||
472 | struct snd_mixart *chip = snd_pcm_substream_chip(subs); | 472 | struct snd_mixart *chip = snd_pcm_substream_chip(subs); |
473 | struct mixart_stream *stream = subs->runtime->private_data; | 473 | struct mixart_stream *stream = subs->runtime->private_data; |
474 | 474 | ||
475 | /* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */ | 475 | /* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */ |
476 | 476 | ||
477 | snd_printdd("snd_mixart_prepare\n"); | 477 | snd_printdd("snd_mixart_prepare\n"); |
478 | 478 | ||
diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h index 4c4b882316ac..b8ccfee095c4 100644 --- a/sound/soc/pxa/pxa2xx-ac97.h +++ b/sound/soc/pxa/pxa2xx-ac97.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/pxa2xx-ac97.h | 2 | * linux/sound/soc/pxa/pxa2xx-ac97.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
diff --git a/sound/soc/pxa/pxa2xx-i2s.h b/sound/soc/pxa/pxa2xx-i2s.h index a2484f0881f1..4435bd9f884f 100644 --- a/sound/soc/pxa/pxa2xx-i2s.h +++ b/sound/soc/pxa/pxa2xx-i2s.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/pxa2xx-i2s.h | 2 | * linux/sound/soc/pxa/pxa2xx-i2s.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 25a2a7333006..e07085a7cfc3 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -673,7 +673,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) | |||
673 | } | 673 | } |
674 | 674 | ||
675 | /* | 675 | /* |
676 | * Send prepared cmd string. It works by writting a JUMP cmd into | 676 | * Send prepared cmd string. It works by writing a JUMP cmd into |
677 | * the last WAIT cmd and force DBRI to reread the cmd. | 677 | * the last WAIT cmd and force DBRI to reread the cmd. |
678 | * The JUMP cmd points to the new cmd string. | 678 | * The JUMP cmd points to the new cmd string. |
679 | * It also releases the cmdlock spinlock. | 679 | * It also releases the cmdlock spinlock. |