diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/eeprom.c | 6 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/i2c.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/kernel/kgdb.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 8 | ||||
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 8 | ||||
-rw-r--r-- | arch/m68knommu/Kconfig | 4 | ||||
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 4 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh64/lib/dbg.c | 2 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 4 | ||||
-rw-r--r-- | arch/um/drivers/chan_user.c | 2 |
20 files changed, 32 insertions, 32 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 57f23b465392..e316bd93313f 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
@@ -133,7 +133,7 @@ config IXP4XX_INDIRECT_PCI | |||
133 | into the kernel and we can use the standard read[bwl]/write[bwl] | 133 | into the kernel and we can use the standard read[bwl]/write[bwl] |
134 | macros. This is the preferred method due to speed but it | 134 | macros. This is the preferred method due to speed but it |
135 | limits the system to just 64MB of PCI memory. This can be | 135 | limits the system to just 64MB of PCI memory. This can be |
136 | problamatic if using video cards and other memory-heavy devices. | 136 | problematic if using video cards and other memory-heavy devices. |
137 | 137 | ||
138 | 2) If > 64MB of memory space is required, the IXP4xx can be | 138 | 2) If > 64MB of memory space is required, the IXP4xx can be |
139 | configured to use indirect registers to access PCI This allows | 139 | configured to use indirect registers to access PCI This allows |
diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig index 147b01928a9b..6f4c6a1798c1 100644 --- a/arch/arm/mach-lh7a40x/Kconfig +++ b/arch/arm/mach-lh7a40x/Kconfig | |||
@@ -8,7 +8,7 @@ config MACH_KEV7A400 | |||
8 | help | 8 | help |
9 | Say Y here if you are using the Sharp KEV7A400 development | 9 | Say Y here if you are using the Sharp KEV7A400 development |
10 | board. This hardware is discontinued, so I'd be very | 10 | board. This hardware is discontinued, so I'd be very |
11 | suprised if you wanted this option. | 11 | surprised if you wanted this option. |
12 | 12 | ||
13 | config MACH_LPD7A400 | 13 | config MACH_LPD7A400 |
14 | bool "LPD7A400 Card Engine" | 14 | bool "LPD7A400 Card Engine" |
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index 63965c78de8c..9aa26b99045d 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
@@ -91,7 +91,7 @@ config SMDK2440_CPU2442 | |||
91 | config MACH_S3C2413 | 91 | config MACH_S3C2413 |
92 | bool | 92 | bool |
93 | help | 93 | help |
94 | Internal node for S3C2413 verison of SMDK2413, so that | 94 | Internal node for S3C2413 version of SMDK2413, so that |
95 | machine_is_s3c2413() will work when MACH_SMDK2413 is | 95 | machine_is_s3c2413() will work when MACH_SMDK2413 is |
96 | selected | 96 | selected |
97 | 97 | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c0bfb8212b77..b09a19f87d68 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -197,7 +197,7 @@ config CPU_ARM940T | |||
197 | select CPU_CP15_MPU | 197 | select CPU_CP15_MPU |
198 | help | 198 | help |
199 | ARM940T is a member of the ARM9TDMI family of general- | 199 | ARM940T is a member of the ARM9TDMI family of general- |
200 | purpose microprocessors with MPU and seperate 4KB | 200 | purpose microprocessors with MPU and separate 4KB |
201 | instruction and 4KB data cases, each with a 4-word line | 201 | instruction and 4KB data cases, each with a 4-word line |
202 | length. | 202 | length. |
203 | 203 | ||
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig index 44eb1b9accb3..c7ea9efd0104 100644 --- a/arch/cris/arch-v10/Kconfig +++ b/arch/cris/arch-v10/Kconfig | |||
@@ -323,7 +323,7 @@ config ETRAX_DEF_R_WAITSTATES | |||
323 | depends on ETRAX_ARCH_V10 | 323 | depends on ETRAX_ARCH_V10 |
324 | default "95a6" | 324 | default "95a6" |
325 | help | 325 | help |
326 | Waitstates for SRAM, Flash and peripherials (not DRAM). 95f8 is a | 326 | Waitstates for SRAM, Flash and peripherals (not DRAM). 95f8 is a |
327 | good choice for most Axis products... | 327 | good choice for most Axis products... |
328 | 328 | ||
329 | config ETRAX_DEF_R_BUS_CONFIG | 329 | config ETRAX_DEF_R_BUS_CONFIG |
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 734d5f3a5304..e7e724bc0ba6 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
@@ -839,7 +839,7 @@ config ETRAX_DS1302_TRICKLE_CHARGE | |||
839 | default "0" | 839 | default "0" |
840 | help | 840 | help |
841 | This controls the initial value of the trickle charge register. | 841 | This controls the initial value of the trickle charge register. |
842 | 0 = disabled (use this if you are unsure or have a non rechargable battery) | 842 | 0 = disabled (use this if you are unsure or have a non rechargeable battery) |
843 | Otherwise the following values can be OR:ed together to control the | 843 | Otherwise the following values can be OR:ed together to control the |
844 | charge current: | 844 | charge current: |
845 | 1 = 2kohm, 2 = 4kohm, 3 = 4kohm | 845 | 1 = 2kohm, 2 = 4kohm, 3 = 4kohm |
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 6e1f191a71e3..284ebfda03f0 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /*!***************************************************************************** | 1 | /*!***************************************************************************** |
2 | *! | 2 | *! |
3 | *! Implements an interface for i2c compatible eeproms to run under linux. | 3 | *! Implements an interface for i2c compatible eeproms to run under Linux. |
4 | *! Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustents by | 4 | *! Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustments by |
5 | *! Johan.Adolfsson@axis.com | 5 | *! Johan.Adolfsson@axis.com |
6 | *! | 6 | *! |
7 | *! Probing results: | 7 | *! Probing results: |
@@ -51,7 +51,7 @@ | |||
51 | *! Revision 1.8 2001/06/15 13:24:29 jonashg | 51 | *! Revision 1.8 2001/06/15 13:24:29 jonashg |
52 | *! * Added verification of pointers from userspace in read and write. | 52 | *! * Added verification of pointers from userspace in read and write. |
53 | *! * Made busy counter volatile. | 53 | *! * Made busy counter volatile. |
54 | *! * Added define for inital write delay. | 54 | *! * Added define for initial write delay. |
55 | *! * Removed warnings by using loff_t instead of unsigned long. | 55 | *! * Removed warnings by using loff_t instead of unsigned long. |
56 | *! | 56 | *! |
57 | *! Revision 1.7 2001/06/14 15:26:54 jonashg | 57 | *! Revision 1.7 2001/06/14 15:26:54 jonashg |
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c index 6114596c3b33..092c724a645f 100644 --- a/arch/cris/arch-v10/drivers/i2c.c +++ b/arch/cris/arch-v10/drivers/i2c.c | |||
@@ -47,7 +47,7 @@ | |||
47 | *! Update Port B register and shadow even when running with hardware support | 47 | *! Update Port B register and shadow even when running with hardware support |
48 | *! to avoid glitches when reading bits | 48 | *! to avoid glitches when reading bits |
49 | *! Never set direction to out in i2c_inbyte | 49 | *! Never set direction to out in i2c_inbyte |
50 | *! Removed incorrect clock togling at end of i2c_inbyte | 50 | *! Removed incorrect clock toggling at end of i2c_inbyte |
51 | *! | 51 | *! |
52 | *! Revision 1.8 2002/08/13 06:31:53 starvik | 52 | *! Revision 1.8 2002/08/13 06:31:53 starvik |
53 | *! Made SDA and SCL line configurable | 53 | *! Made SDA and SCL line configurable |
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c index 34528da98817..07628a13c6c4 100644 --- a/arch/cris/arch-v10/kernel/kgdb.c +++ b/arch/cris/arch-v10/kernel/kgdb.c | |||
@@ -33,7 +33,7 @@ | |||
33 | *! | 33 | *! |
34 | *! Revision 1.2 2002/11/19 14:35:24 starvik | 34 | *! Revision 1.2 2002/11/19 14:35:24 starvik |
35 | *! Changes from linux 2.4 | 35 | *! Changes from linux 2.4 |
36 | *! Changed struct initializer syntax to the currently prefered notation | 36 | *! Changed struct initializer syntax to the currently preferred notation |
37 | *! | 37 | *! |
38 | *! Revision 1.1 2001/12/17 13:59:27 bjornw | 38 | *! Revision 1.1 2001/12/17 13:59:27 bjornw |
39 | *! Initial revision | 39 | *! Initial revision |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index a33097f95362..f64624fc4504 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -88,7 +88,7 @@ config ETRAX_SERIAL_PORT0_DMA7_IN | |||
88 | help | 88 | help |
89 | Enables the DMA7 input channel for ser0 (ttyS0). | 89 | Enables the DMA7 input channel for ser0 (ttyS0). |
90 | If you do not enable DMA, an interrupt for each character will be | 90 | If you do not enable DMA, an interrupt for each character will be |
91 | used when receiveing data. | 91 | used when receiving data. |
92 | Normally you want to use DMA, unless you use the DMA channel for | 92 | Normally you want to use DMA, unless you use the DMA channel for |
93 | something else. | 93 | something else. |
94 | 94 | ||
@@ -157,7 +157,7 @@ config ETRAX_SERIAL_PORT1_DMA5_IN | |||
157 | help | 157 | help |
158 | Enables the DMA5 input channel for ser1 (ttyS1). | 158 | Enables the DMA5 input channel for ser1 (ttyS1). |
159 | If you do not enable DMA, an interrupt for each character will be | 159 | If you do not enable DMA, an interrupt for each character will be |
160 | used when receiveing data. | 160 | used when receiving data. |
161 | Normally you want this on, unless you use the DMA channel for | 161 | Normally you want this on, unless you use the DMA channel for |
162 | something else. | 162 | something else. |
163 | 163 | ||
@@ -228,7 +228,7 @@ config ETRAX_SERIAL_PORT2_DMA3_IN | |||
228 | help | 228 | help |
229 | Enables the DMA3 input channel for ser2 (ttyS2). | 229 | Enables the DMA3 input channel for ser2 (ttyS2). |
230 | If you do not enable DMA, an interrupt for each character will be | 230 | If you do not enable DMA, an interrupt for each character will be |
231 | used when receiveing data. | 231 | used when receiving data. |
232 | Normally you want to use DMA, unless you use the DMA channel for | 232 | Normally you want to use DMA, unless you use the DMA channel for |
233 | something else. | 233 | something else. |
234 | 234 | ||
@@ -297,7 +297,7 @@ config ETRAX_SERIAL_PORT3_DMA9_IN | |||
297 | help | 297 | help |
298 | Enables the DMA9 input channel for ser3 (ttyS3). | 298 | Enables the DMA9 input channel for ser3 (ttyS3). |
299 | If you do not enable DMA, an interrupt for each character will be | 299 | If you do not enable DMA, an interrupt for each character will be |
300 | used when receiveing data. | 300 | used when receiving data. |
301 | Normally you want to use DMA, unless you use the DMA channel for | 301 | Normally you want to use DMA, unless you use the DMA channel for |
302 | something else. | 302 | something else. |
303 | 303 | ||
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index db8e1fcfa047..14691cda05c3 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -75,7 +75,7 @@ | |||
75 | ** If a device prefetches beyond the end of a valid pdir entry, it will cause | 75 | ** If a device prefetches beyond the end of a valid pdir entry, it will cause |
76 | ** a hard failure, ie. MCA. Version 3.0 and later of the zx1 LBA should | 76 | ** a hard failure, ie. MCA. Version 3.0 and later of the zx1 LBA should |
77 | ** disconnect on 4k boundaries and prevent such issues. If the device is | 77 | ** disconnect on 4k boundaries and prevent such issues. If the device is |
78 | ** particularly agressive, this option will keep the entire pdir valid such | 78 | ** particularly aggressive, this option will keep the entire pdir valid such |
79 | ** that prefetching will hit a valid address. This could severely impact | 79 | ** that prefetching will hit a valid address. This could severely impact |
80 | ** error containment, and is therefore off by default. The page that is | 80 | ** error containment, and is therefore off by default. The page that is |
81 | ** used for spill-over is poisoned, so that should help debugging somewhat. | 81 | ** used for spill-over is poisoned, so that should help debugging somewhat. |
@@ -258,10 +258,10 @@ static u64 prefetch_spill_page; | |||
258 | 258 | ||
259 | /* | 259 | /* |
260 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up | 260 | ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up |
261 | ** (or rather not merge) DMA's into managable chunks. | 261 | ** (or rather not merge) DMAs into manageable chunks. |
262 | ** On parisc, this is more of the software/tuning constraint | 262 | ** On parisc, this is more of the software/tuning constraint |
263 | ** rather than the HW. I/O MMU allocation alogorithms can be | 263 | ** rather than the HW. I/O MMU allocation algorithms can be |
264 | ** faster with smaller size is (to some degree). | 264 | ** faster with smaller sizes (to some degree). |
265 | */ | 265 | */ |
266 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*iovp_size) | 266 | #define DMA_CHUNK_SIZE (BITS_PER_LONG*iovp_size) |
267 | 267 | ||
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 6d920d4bdc3d..c1bc22c6d0d8 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
@@ -565,7 +565,7 @@ config ROMVEC | |||
565 | depends on ROM | 565 | depends on ROM |
566 | help | 566 | help |
567 | This is almost always the same as the base of the ROM. Since on all | 567 | This is almost always the same as the base of the ROM. Since on all |
568 | 68000 type varients the vectors are at the base of the boot device | 568 | 68000 type variants the vectors are at the base of the boot device |
569 | on system startup. | 569 | on system startup. |
570 | 570 | ||
571 | config ROMVECSIZE | 571 | config ROMVECSIZE |
@@ -574,7 +574,7 @@ config ROMVECSIZE | |||
574 | depends on ROM | 574 | depends on ROM |
575 | help | 575 | help |
576 | Define the size of the vector region in ROM. For most 68000 | 576 | Define the size of the vector region in ROM. For most 68000 |
577 | varients this would be 0x400 bytes in size. Set to 0 if you do | 577 | variants this would be 0x400 bytes in size. Set to 0 if you do |
578 | not want a vector region at the start of the ROM. | 578 | not want a vector region at the start of the ROM. |
579 | 579 | ||
580 | config ROMSTART | 580 | config ROMSTART |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1443024b1c7c..22bb540b5c05 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -865,7 +865,7 @@ config MIPS_DISABLE_OBSOLETE_IDE | |||
865 | bool | 865 | bool |
866 | 866 | ||
867 | # | 867 | # |
868 | # Endianess selection. Suffiently obscure so many users don't know what to | 868 | # Endianess selection. Sufficiently obscure so many users don't know what to |
869 | # answer,so we try hard to limit the available choices. Also the use of a | 869 | # answer,so we try hard to limit the available choices. Also the use of a |
870 | # choice statement should be more obvious to the user. | 870 | # choice statement should be more obvious to the user. |
871 | # | 871 | # |
@@ -874,7 +874,7 @@ choice | |||
874 | help | 874 | help |
875 | Some MIPS machines can be configured for either little or big endian | 875 | Some MIPS machines can be configured for either little or big endian |
876 | byte order. These modes require different kernels and a different | 876 | byte order. These modes require different kernels and a different |
877 | Linux distribution. In general there is one prefered byteorder for a | 877 | Linux distribution. In general there is one preferred byteorder for a |
878 | particular system but some systems are just as commonly used in the | 878 | particular system but some systems are just as commonly used in the |
879 | one or the other endianess. | 879 | one or the other endianess. |
880 | 880 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0673dbedb241..116d7d3683ed 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -425,7 +425,7 @@ config PPC_MAPLE | |||
425 | default n | 425 | default n |
426 | help | 426 | help |
427 | This option enables support for the Maple 970FX Evaluation Board. | 427 | This option enables support for the Maple 970FX Evaluation Board. |
428 | For more informations, refer to <http://www.970eval.com> | 428 | For more information, refer to <http://www.970eval.com> |
429 | 429 | ||
430 | config PPC_PASEMI | 430 | config PPC_PASEMI |
431 | depends on PPC_MULTIPLATFORM && PPC64 | 431 | depends on PPC_MULTIPLATFORM && PPC64 |
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index 7edb6b461382..edcd5b875b66 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig | |||
@@ -21,7 +21,7 @@ config MPC834x_SYS | |||
21 | Be aware that PCI buses can only function when SYS board is plugged | 21 | Be aware that PCI buses can only function when SYS board is plugged |
22 | into the PIB (Platform IO Board) board from Freescale which provide | 22 | into the PIB (Platform IO Board) board from Freescale which provide |
23 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | 23 | 3 PCI slots. The PIBs PCI initialization is the bootloader's |
24 | responsiblilty. | 24 | responsibility. |
25 | 25 | ||
26 | config MPC834x_ITX | 26 | config MPC834x_ITX |
27 | bool "Freescale MPC834x ITX" | 27 | bool "Freescale MPC834x ITX" |
@@ -30,7 +30,7 @@ config MPC834x_ITX | |||
30 | This option enables support for the MPC 834x ITX evaluation board. | 30 | This option enables support for the MPC 834x ITX evaluation board. |
31 | 31 | ||
32 | Be aware that PCI initialization is the bootloader's | 32 | Be aware that PCI initialization is the bootloader's |
33 | responsiblilty. | 33 | responsibility. |
34 | 34 | ||
35 | config MPC8360E_PB | 35 | config MPC8360E_PB |
36 | bool "Freescale MPC8360E PB" | 36 | bool "Freescale MPC8360E PB" |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 077711e63104..ef018e25fb07 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -724,7 +724,7 @@ config MPC834x_SYS | |||
724 | Be aware that PCI buses can only function when SYS board is plugged | 724 | Be aware that PCI buses can only function when SYS board is plugged |
725 | into the PIB (Platform IO Board) board from Freescale which provide | 725 | into the PIB (Platform IO Board) board from Freescale which provide |
726 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | 726 | 3 PCI slots. The PIBs PCI initialization is the bootloader's |
727 | responsiblilty. | 727 | responsibility. |
728 | 728 | ||
729 | config EV64360 | 729 | config EV64360 |
730 | bool "Marvell-EV64360BP" | 730 | bool "Marvell-EV64360BP" |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6a461d4caeff..bffc7e176970 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -217,7 +217,7 @@ config SH_SHMIN | |||
217 | bool "SHMIN" | 217 | bool "SHMIN" |
218 | select CPU_SUBTYPE_SH7706 | 218 | select CPU_SUBTYPE_SH7706 |
219 | help | 219 | help |
220 | Select SHMIN if configureing for the SHMIN board | 220 | Select SHMIN if configuring for the SHMIN board. |
221 | 221 | ||
222 | config SH_UNKNOWN | 222 | config SH_UNKNOWN |
223 | bool "BareCPU" | 223 | bool "BareCPU" |
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c index 1326f45f31eb..4310fc87444e 100644 --- a/arch/sh64/lib/dbg.c +++ b/arch/sh64/lib/dbg.c | |||
@@ -383,7 +383,7 @@ void show_excp_regs(char *from, int trapnr, int signr, struct pt_regs *regs) | |||
383 | /* ======================================================================= */ | 383 | /* ======================================================================= */ |
384 | 384 | ||
385 | /* | 385 | /* |
386 | ** Depending on <base> scan the MMU, Data or Instrction side | 386 | ** Depending on <base> scan the MMU, Data or Instruction side |
387 | ** looking for a valid mapping matching Eaddr & asid. | 387 | ** looking for a valid mapping matching Eaddr & asid. |
388 | ** Return -1 if not found or the TLB id entry otherwise. | 388 | ** Return -1 if not found or the TLB id entry otherwise. |
389 | ** Note: it works only for 4k pages! | 389 | ** Note: it works only for 4k pages! |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2f96610a83e9..92a7c8a636d3 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -212,8 +212,8 @@ config SPARC_LED | |||
212 | tristate "Sun4m LED driver" | 212 | tristate "Sun4m LED driver" |
213 | help | 213 | help |
214 | This driver toggles the front-panel LED on sun4m systems | 214 | This driver toggles the front-panel LED on sun4m systems |
215 | in a user-specifyable manner. It's state can be probed | 215 | in a user-specifiable manner. Its state can be probed |
216 | by reading /proc/led and it's blinking mode can be changed | 216 | by reading /proc/led and its blinking mode can be changed |
217 | via writes to /proc/led | 217 | via writes to /proc/led |
218 | 218 | ||
219 | source "fs/Kconfig.binfmt" | 219 | source "fs/Kconfig.binfmt" |
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 2f880cb167a5..0cad3546cb89 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c | |||
@@ -120,7 +120,7 @@ static int winch_thread(void *arg) | |||
120 | /* These are synchronization calls between various UML threads on the | 120 | /* These are synchronization calls between various UML threads on the |
121 | * host - since they are not different kernel threads, we cannot use | 121 | * host - since they are not different kernel threads, we cannot use |
122 | * kernel semaphores. We don't use SysV semaphores because they are | 122 | * kernel semaphores. We don't use SysV semaphores because they are |
123 | * persistant. */ | 123 | * persistent. */ |
124 | count = os_read_file(pipe_fd, &c, sizeof(c)); | 124 | count = os_read_file(pipe_fd, &c, sizeof(c)); |
125 | if(count != sizeof(c)) | 125 | if(count != sizeof(c)) |
126 | printk("winch_thread : failed to read synchronization byte, " | 126 | printk("winch_thread : failed to read synchronization byte, " |