aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/MSI-HOWTO.txt6
-rw-r--r--Documentation/block/ioprio.txt8
-rw-r--r--Documentation/cpu-freq/cpufreq-stats.txt2
-rw-r--r--Documentation/driver-model/platform.txt2
-rw-r--r--Documentation/fb/imacfb.txt2
-rw-r--r--Documentation/filesystems/hpfs.txt2
-rw-r--r--Documentation/filesystems/ntfs.txt2
-rw-r--r--Documentation/filesystems/relay.txt2
-rw-r--r--Documentation/filesystems/xip.txt2
-rw-r--r--Documentation/fujitsu/frv/gdbstub.txt2
-rw-r--r--Documentation/input/atarikbd.txt4
-rw-r--r--Documentation/input/xpad.txt6
-rw-r--r--Documentation/networking/NAPI_HOWTO.txt2
-rw-r--r--Documentation/networking/udplite.txt2
-rw-r--r--Documentation/networking/wan-router.txt4
-rw-r--r--Documentation/pnp.txt2
-rw-r--r--Documentation/powerpc/booting-without-of.txt2
-rw-r--r--Documentation/scsi/aic7xxx.txt2
-rw-r--r--Documentation/scsi/aic7xxx_old.txt2
-rw-r--r--Documentation/scsi/ncr53c8xx.txt2
-rw-r--r--Documentation/scsi/sym53c8xx_2.txt2
-rw-r--r--Documentation/sysctl/kernel.txt2
-rw-r--r--arch/arm/mach-at91/Kconfig2
-rw-r--r--arch/arm/mach-omap1/Kconfig2
-rw-r--r--drivers/isdn/capi/Kconfig2
-rw-r--r--drivers/media/video/pwc/philips.txt6
-rw-r--r--drivers/message/fusion/lsi/mpi_history.txt2
-rw-r--r--drivers/mtd/maps/Kconfig2
-rw-r--r--sound/core/Kconfig2
29 files changed, 40 insertions, 40 deletions
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
4816.1. Disabling MSI on a single device 4816.1. Disabling MSI on a single device
482 482
483Under some circumstances, it might be required to disable MSI on a 483Under some circumstances it might be required to disable MSI on a
484single device, It may be achived by either not calling pci_enable_msi() 484single device. This may be achieved by either not calling pci_enable_msi()
485or all, or setting the pci_dev->no_msi flag before (most of the time 485or all, or setting the pci_dev->no_msi flag before (most of the time
486in a quirk). 486in a quirk).
487 487
@@ -492,7 +492,7 @@ being able to route MSI between busses. In this case, MSI have to be
492disabled on all devices behind this bridge. It is achieves by setting 492disabled on all devices behind this bridge. It is achieves by setting
493the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge 493the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge
494subordinate bus. There is no need to set the same flag on bridges that 494subordinate bus. There is no need to set the same flag on bridges that
495are below the broken brigde. When pci_enable_msi() is called to enable 495are below the broken bridge. When pci_enable_msi() is called to enable
496MSI on a device, pci_msi_supported() takes care of checking the NO_MSI 496MSI on a device, pci_msi_supported() takes care of checking the NO_MSI
497flag in all parent busses of the device. 497flag in all parent busses of the device.
498 498
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
8With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io 8With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io
9priorities is supported for reads on files. This enables users to io nice 9priorities are supported for reads on files. This enables users to io nice
10processes or process groups, similar to what has been possible to cpu 10processes or process groups, similar to what has been possible with cpu
11scheduling for ages. This document mainly details the current possibilites 11scheduling for ages. This document mainly details the current possibilities
12with cfq, other io schedulers do not support io priorities so far. 12with cfq; other io schedulers do not support io priorities thus far.
13 13
14Scheduling classes 14Scheduling 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
181. Introduction 181. Introduction
19 19
20cpufreq-stats is a driver that provices CPU frequency statistics for each CPU. 20cpufreq-stats is a driver that provides CPU frequency statistics for each CPU.
21These statistics are provided in /sysfs as a bunch of read_only interfaces. This 21These statistics are provided in /sysfs as a bunch of read_only interfaces. This
22interface (when configured) will appear in a separate directory under cpufreq 22interface (when configured) will appear in a separate directory under cpufreq
23in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU. 23in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU.
diff --git a/Documentation/driver-model/platform.txt b/Documentation/driver-model/platform.txt
index c5491c22086c..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
16into system-on-chip platforms. What they usually have in common 16into system-on-chip platforms. What they usually have in common
17is direct addressing from a CPU bus. Rarely, a platform_device will 17is direct addressing from a CPU bus. Rarely, a platform_device will
18be connected through a segment of some other kind of bus; but its 18be connected through a segment of some other kind of bus; but its
19registers will still be directly addressible. 19registers will still be directly addressable.
20 20
21Platform devices are given a name, used in driver binding, and a 21Platform devices are given a name, used in driver binding, and a
22list of resources such as addresses and IRQs. 22list of resources such as addresses and IRQs.
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
19Imacfb does not have any kind of autodetection of your machine. 19Imacfb does not have any kind of autodetection of your machine.
20You have to add the fillowing kernel parameters in your elilo.conf: 20You 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/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
2902.07 More fixes for Warp Server. Now it really works 2902.07 More fixes for Warp Server. Now it really works
2912.08 Creating new files is not so slow on large disks 2912.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
2932.09 Fixed error on extremly fragmented files 2932.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.
349Note the "Should sync?" parameter "nosync" means that the two mirrors are 349Note the "Should sync?" parameter "nosync" means that the two mirrors are
350already in sync which will be the case on a clean shutdown of Windows. If the 350already in sync which will be the case on a clean shutdown of Windows. If the
351mirrors are not clean, you can specify the "sync" option instead of "nosync" 351mirrors are not clean, you can specify the "sync" option instead of "nosync"
352and the Device-Mapper driver will then copy the entirey of the "Source Device" 352and the Device-Mapper driver will then copy the entirety of the "Source Device"
353to the "Target Device" or if you specified multipled target devices to all of 353to the "Target Device" or if you specified multipled target devices to all of
354them. 354them.
355 355
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,
351the callback returns 0 to indicate that the buffer switch should not 351the callback returns 0 to indicate that the buffer switch should not
352occur yet, i.e. until the consumer has had a chance to read the 352occur yet, i.e. until the consumer has had a chance to read the
353current set of ready sub-buffers. For the relay_buf_full() function 353current set of ready sub-buffers. For the relay_buf_full() function
354to make sense, the consumer is reponsible for notifying the relay 354to make sense, the consumer is responsible for notifying the relay
355interface when sub-buffers have been consumed via 355interface when sub-buffers have been consumed via
356relay_subbufs_consumed(). Any subsequent attempts to write into the 356relay_subbufs_consumed(). Any subsequent attempts to write into the
357buffer will again invoke the subbuf_start() callback with the same 357buffer 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
19directly from/to the memory backed storage device. For file mappings, the 19directly from/to the memory backed storage device. For file mappings, the
20storage device itself is mapped directly into userspace. 20storage device itself is mapped directly into userspace.
21 21
22This implementation was initialy written for shared memory segments between 22This implementation was initially written for shared memory segments between
23different virtual machines on s390 hardware to allow multiple machines to 23different virtual machines on s390 hardware to allow multiple machines to
24share the same binaries and libraries. 24share 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
127Furthermore, the GDB stub will intercept a number of exceptions automatically 127Furthermore, the GDB stub will intercept a number of exceptions automatically
128if they are caused by kernel execution. It will also intercept BUG() macro 128if they are caused by kernel execution. It will also intercept BUG() macro
129invokation. 129invocation.
130 130
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
179the mouse. After any joystick command, the ikbd assumes that joysticks are 179the mouse. After any joystick command, the ikbd assumes that joysticks are
180connected to both Joystick0 and Joystick1. Any mouse command (except MOUSE 180connected to both Joystick0 and Joystick1. Any mouse command (except MOUSE
181DISABLE) then causes port 0 to again be scanned as if it were a mouse, and 181DISABLE) then causes port 0 to again be scanned as if it were a mouse, and
182both buttons are logically connected to it. If a mouse diable command is 182both buttons are logically connected to it. If a mouse disable command is
183received while port 0 is presumed to be a mouse, the button is logically 183received while port 0 is presumed to be a mouse, the button is logically
184assigned to Joystick1 ( until the mouse is reenabled by another mouse command). 184assigned to Joystick1 (until the mouse is reenabled by another mouse command).
185 185
1869. ikbd Command Set 1869. 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
65I've tested this with Stepmania, and it works quite well. 65I've tested this with Stepmania, and it works quite well.
66 66
67 67
680.3 Unkown Controllers 680.3 Unknown Controllers
69---------------------- 69----------------------
70If you have an unkown xbox controller, it should work just fine with 70If you have an unknown xbox controller, it should work just fine with
71the default settings. 71the default settings.
72 72
73HOWEVER if you have an unknown dance pad not listed below, it will not 73HOWEVER if you have an unknown dance pad not listed below, it will not
74work UNLESS you set "dpad_to_buttons" to 1 in the module configuration. 74work UNLESS you set "dpad_to_buttons" to 1 in the module configuration.
75 75
76PLEASE if you have an unkown controller, email Dom <binary1230@yahoo.com> with 76PLEASE, if you have an unknown controller, email Dom <binary1230@yahoo.com> with
77a dump from /proc/bus/usb and a description of the pad (manufacturer, country, 77a dump from /proc/bus/usb and a description of the pad (manufacturer, country,
78whether it is a dance pad or normal controller) so that we can add your pad 78whether it is a dance pad or normal controller) so that we can add your pad
79to the list of supported devices, ensuring that it will work out of the 79to the list of supported devices, ensuring that it will work out of the
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
160it completes its work. The device cannot be out of poll list at this 160it completes its work. The device cannot be out of poll list at this
161call, if it is then clearly it is a BUG(). You'll know ;-> 161call, if it is then clearly it is a BUG(). You'll know ;->
162 162
163All these above nethods are used below. So keep reading for clarity. 163All of the above methods are used below, so keep reading for clarity.
164 164
165Device driver changes to be made when porting NAPI 165Device driver changes to be made when porting NAPI
166================================================== 166==================================================
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
3382.0.5 Aug 04, 1999 CHDLC initializatin bug fix. 3382.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
377beta-2.1.4 Jul 2000 o Dynamic interface configuration: 377beta-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/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.
140Requirements for a Linux PnP protocol: 140Requirements for a Linux PnP protocol:
1411.) the protocol must use EISA IDs 1411.) the protocol must use EISA IDs
1422.) the protocol must inform the PnP Layer of a devices current configuration 1422.) 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
145The following are PnP protocol related functions: 145The following are PnP protocol related functions:
146 146
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index c141f2388474..b49ce169a63a 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -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/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.
126015.1 Problem tracking 126015.1 Problem tracking
1261 1261
1262Most SCSI problems are due to a non conformant SCSI bus or to buggy 1262Most SCSI problems are due to a non conformant SCSI bus or to buggy
1263devices. If infortunately you have SCSI problems, you can check the 1263devices. If unfortunately you have SCSI problems, you can check the
1264following things: 1264following things:
1265 1265
1266- SCSI bus cables 1266- SCSI bus cables
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.
58715.1 Problem tracking 58715.1 Problem tracking
588 588
589Most SCSI problems are due to a non conformant SCSI bus or too buggy 589Most SCSI problems are due to a non conformant SCSI bus or too buggy
590devices. If infortunately you have SCSI problems, you can check the 590devices. If unfortunately you have SCSI problems, you can check the
591following things: 591following things:
592 592
593- SCSI bus cables 593- SCSI bus cables
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index d3d3c255ddb7..111fd28727ec 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -221,7 +221,7 @@ Controls the kernel's behaviour when an oops or BUG is encountered.
221 221
2220: try to continue operation 2220: try to continue operation
223 223
2241: panic immediatly. If the `panic' sysctl is also non-zero then the 2241: 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==============================================================
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
112comment "AT91SAM9260 / AT91SAM9XE Board Type" 112comment "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
90config MACH_NOKIA770 90config MACH_NOKIA770
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/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
56fbufs 56fbufs
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/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/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
62config MTD_PHYSMAP_OF 62config 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/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
152config SND_VERBOSE_PRINTK 152config SND_VERBOSE_PRINTK