diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/Kconfig | 2 | ||||
-rw-r--r-- | arch/avr32/Kconfig | 6 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 6 | ||||
-rw-r--r-- | arch/cris/Kconfig | 6 | ||||
-rw-r--r-- | arch/cris/arch-v32/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-fs/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/sysdev/bestcomm/Kconfig | 4 | ||||
-rw-r--r-- | arch/sh/Kconfig | 4 | ||||
-rw-r--r-- | arch/x86/Kconfig | 4 |
13 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 3f325d3718a9..cd8de89c5fad 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -109,7 +109,7 @@ config MACH_OMAP_PALMZ71 | |||
109 | help | 109 | help |
110 | Support for the Palm Zire71 PDA. To boot the kernel, | 110 | Support for the Palm Zire71 PDA. To boot the kernel, |
111 | you'll need a PalmOS compatible bootloader; check out | 111 | you'll need a PalmOS compatible bootloader; check out |
112 | http://hackndev.com/palm/z71 for more informations. | 112 | http://hackndev.com/palm/z71 for more information. |
113 | Say Y here if you have such a PDA, say N otherwise. | 113 | Say Y here if you have such a PDA, say N otherwise. |
114 | 114 | ||
115 | config MACH_OMAP_PALMTT | 115 | config MACH_OMAP_PALMTT |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 05fe3053dcae..414a8ad97f52 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -127,13 +127,13 @@ config BOARD_HAMMERHEAD | |||
127 | select CPU_AT32AP7000 | 127 | select CPU_AT32AP7000 |
128 | select USB_ARCH_HAS_HCD | 128 | select USB_ARCH_HAS_HCD |
129 | help | 129 | help |
130 | The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel. | 130 | The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel. |
131 | It offers versatile peripherals, such as ethernet, usb device, usb host etc. | 131 | It offers versatile peripherals, such as ethernet, usb device, usb host etc. |
132 | 132 | ||
133 | The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered | 133 | The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered |
134 | Device (PD). | 134 | Device (PD). |
135 | 135 | ||
136 | Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is | 136 | Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is |
137 | mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which | 137 | mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which |
138 | will cover even the most exceptional need of memory bandwidth. Together with the onboard | 138 | will cover even the most exceptional need of memory bandwidth. Together with the onboard |
139 | video decoder the board is ready for video processing. | 139 | video decoder the board is ready for video processing. |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 0c1f86e3e44a..3640cdc38aac 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -777,7 +777,7 @@ config CACHELINE_ALIGNED_L1 | |||
777 | default n if BF54x | 777 | default n if BF54x |
778 | depends on !BF531 | 778 | depends on !BF531 |
779 | help | 779 | help |
780 | If enabled, cacheline_anligned data is linked | 780 | If enabled, cacheline_aligned data is linked |
781 | into L1 data memory. (less latency) | 781 | into L1 data memory. (less latency) |
782 | 782 | ||
783 | config SYSCALL_TAB_L1 | 783 | config SYSCALL_TAB_L1 |
@@ -957,7 +957,7 @@ config MPU | |||
957 | memory they do not own. This comes at a performance penalty | 957 | memory they do not own. This comes at a performance penalty |
958 | and is recommended only for debugging. | 958 | and is recommended only for debugging. |
959 | 959 | ||
960 | comment "Asynchonous Memory Configuration" | 960 | comment "Asynchronous Memory Configuration" |
961 | 961 | ||
962 | menu "EBIU_AMGCTL Global Control" | 962 | menu "EBIU_AMGCTL Global Control" |
963 | config C_AMCKEN | 963 | config C_AMCKEN |
@@ -989,7 +989,7 @@ config C_B3PEN | |||
989 | default n | 989 | default n |
990 | 990 | ||
991 | choice | 991 | choice |
992 | prompt"Enable Asynchonous Memory Banks" | 992 | prompt "Enable Asynchronous Memory Banks" |
993 | default C_AMBEN_ALL | 993 | default C_AMBEN_ALL |
994 | 994 | ||
995 | config C_AMBEN | 995 | config C_AMBEN |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 3462245fe9fb..7adac388a771 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -438,7 +438,7 @@ config ETRAX_SERIAL_PORT0_DMA1_IN | |||
438 | help | 438 | help |
439 | Enables the DMA1 input channel for ser0 (ttyS0). | 439 | Enables the DMA1 input channel for ser0 (ttyS0). |
440 | If you do not enable DMA, an interrupt for each character will be | 440 | If you do not enable DMA, an interrupt for each character will be |
441 | used when receiveing data. | 441 | used when receiving data. |
442 | Normally you want to use DMA, unless you use the DMA channel for | 442 | Normally you want to use DMA, unless you use the DMA channel for |
443 | something else. | 443 | something else. |
444 | 444 | ||
@@ -565,7 +565,7 @@ config ETRAX_SERIAL_PORT2_DMA7_IN | |||
565 | help | 565 | help |
566 | Enables the DMA7 input channel for ser2 (ttyS2). | 566 | Enables the DMA7 input channel for ser2 (ttyS2). |
567 | If you do not enable DMA, an interrupt for each character will be | 567 | If you do not enable DMA, an interrupt for each character will be |
568 | used when receiveing data. | 568 | used when receiving data. |
569 | Normally you want to use DMA, unless you use the DMA channel for | 569 | Normally you want to use DMA, unless you use the DMA channel for |
570 | something else. | 570 | something else. |
571 | 571 | ||
@@ -604,7 +604,7 @@ config ETRAX_SERIAL_PORT3_DMA3_IN | |||
604 | help | 604 | help |
605 | Enables the DMA3 input channel for ser3 (ttyS3). | 605 | Enables the DMA3 input channel for ser3 (ttyS3). |
606 | If you do not enable DMA, an interrupt for each character will be | 606 | If you do not enable DMA, an interrupt for each character will be |
607 | used when receiveing data. | 607 | used when receiving data. |
608 | Normally you want to use DMA, unless you use the DMA channel for | 608 | Normally you want to use DMA, unless you use the DMA channel for |
609 | something else. | 609 | something else. |
610 | 610 | ||
diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig index 005ed2b3f7f4..21bbd93be34f 100644 --- a/arch/cris/arch-v32/Kconfig +++ b/arch/cris/arch-v32/Kconfig | |||
@@ -28,7 +28,7 @@ config ETRAX_NBR_LED_GRP_ONE | |||
28 | help | 28 | help |
29 | Select this if you want one Ethernet LED group. This LED group | 29 | Select this if you want one Ethernet LED group. This LED group |
30 | can be used for one or more Ethernet interfaces. However, it is | 30 | can be used for one or more Ethernet interfaces. However, it is |
31 | recomended that each Ethernet interface use a dedicated LED group. | 31 | recommended that each Ethernet interface use a dedicated LED group. |
32 | 32 | ||
33 | config ETRAX_NBR_LED_GRP_TWO | 33 | config ETRAX_NBR_LED_GRP_TWO |
34 | bool "Use two LED groups" | 34 | bool "Use two LED groups" |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 7a64fcef9d07..b9e328e688be 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -342,7 +342,7 @@ config ETRAX_SERIAL_PORT4_DMA9_IN | |||
342 | help | 342 | help |
343 | Enables the DMA9 input channel for ser4 (ttyS4). | 343 | Enables the DMA9 input channel for ser4 (ttyS4). |
344 | If you do not enable DMA, an interrupt for each character will be | 344 | If you do not enable DMA, an interrupt for each character will be |
345 | used when receiveing data. | 345 | used when receiving data. |
346 | Normally you want to use DMA, unless you use the DMA channel for | 346 | Normally you want to use DMA, unless you use the DMA channel for |
347 | something else. | 347 | something else. |
348 | 348 | ||
diff --git a/arch/cris/arch-v32/mach-fs/Kconfig b/arch/cris/arch-v32/mach-fs/Kconfig index f6d74475f1c6..774de82abef6 100644 --- a/arch/cris/arch-v32/mach-fs/Kconfig +++ b/arch/cris/arch-v32/mach-fs/Kconfig | |||
@@ -59,7 +59,7 @@ config ETRAX_SDRAM_GRP1_CONFIG | |||
59 | depends on ETRAX_ARCH_V32 | 59 | depends on ETRAX_ARCH_V32 |
60 | default "0" | 60 | default "0" |
61 | help | 61 | help |
62 | SDRAM configuration for group 1. The defult value is 0 | 62 | SDRAM configuration for group 1. The default value is 0 |
63 | because group 1 is not used in the default configuration, | 63 | because group 1 is not used in the default configuration, |
64 | described in the help for SDRAM_GRP0_CONFIG. | 64 | described in the help for SDRAM_GRP0_CONFIG. |
65 | 65 | ||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 206cb7953b0c..92508c521673 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -136,7 +136,7 @@ config MACH_JAZZ | |||
136 | help | 136 | help |
137 | This a family of machines based on the MIPS R4030 chipset which was | 137 | This a family of machines based on the MIPS R4030 chipset which was |
138 | used by several vendors to build RISC/os and Windows NT workstations. | 138 | used by several vendors to build RISC/os and Windows NT workstations. |
139 | Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and | 139 | Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and |
140 | Olivetti M700-10 workstations. | 140 | Olivetti M700-10 workstations. |
141 | 141 | ||
142 | config LASAT | 142 | config LASAT |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 74cc312c347c..2e2160c3de7c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -342,7 +342,7 @@ config PHYP_DUMP | |||
342 | help | 342 | help |
343 | Hypervisor-assisted dump is meant to be a kdump replacement | 343 | Hypervisor-assisted dump is meant to be a kdump replacement |
344 | offering robustness and speed not possible without system | 344 | offering robustness and speed not possible without system |
345 | hypervisor assistence. | 345 | hypervisor assistance. |
346 | 346 | ||
347 | If unsure, say "N" | 347 | If unsure, say "N" |
348 | 348 | ||
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 200b9cb900ea..9a8bb53d315d 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -298,7 +298,7 @@ config CPM | |||
298 | config OF_RTC | 298 | config OF_RTC |
299 | bool | 299 | bool |
300 | help | 300 | help |
301 | Uses information from the OF or flattened device tree to instatiate | 301 | Uses information from the OF or flattened device tree to instantiate |
302 | platform devices for direct mapped RTC chips like the DS1742 or DS1743. | 302 | platform devices for direct mapped RTC chips like the DS1742 or DS1743. |
303 | 303 | ||
304 | source "arch/powerpc/sysdev/bestcomm/Kconfig" | 304 | source "arch/powerpc/sysdev/bestcomm/Kconfig" |
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig index 0b192a1c429d..29e427085efb 100644 --- a/arch/powerpc/sysdev/bestcomm/Kconfig +++ b/arch/powerpc/sysdev/bestcomm/Kconfig | |||
@@ -9,8 +9,8 @@ config PPC_BESTCOMM | |||
9 | select PPC_LIB_RHEAP | 9 | select PPC_LIB_RHEAP |
10 | help | 10 | help |
11 | BestComm is the name of the communication coprocessor found | 11 | BestComm is the name of the communication coprocessor found |
12 | on the Freescale MPC5200 family of processor. It's usage is | 12 | on the Freescale MPC5200 family of processor. Its usage is |
13 | optionnal for some drivers (like ATA), but required for | 13 | optional for some drivers (like ATA), but required for |
14 | others (like FEC). | 14 | others (like FEC). |
15 | 15 | ||
16 | If you want to use drivers that require DMA operations, | 16 | If you want to use drivers that require DMA operations, |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8d50d527c595..2d52b515c241 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -640,10 +640,10 @@ config GUSA_RB | |||
640 | depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A) | 640 | depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A) |
641 | help | 641 | help |
642 | Enabling this option will allow the kernel to implement some | 642 | Enabling this option will allow the kernel to implement some |
643 | atomic operations using a software implemention of load-locked/ | 643 | atomic operations using a software implementation of load-locked/ |
644 | store-conditional (LLSC). On machines which do not have hardware | 644 | store-conditional (LLSC). On machines which do not have hardware |
645 | LLSC, this should be more efficient than the other alternative of | 645 | LLSC, this should be more efficient than the other alternative of |
646 | disabling insterrupts around the atomic sequence. | 646 | disabling interrupts around the atomic sequence. |
647 | 647 | ||
648 | endmenu | 648 | endmenu |
649 | 649 | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 06c02c00d7d9..d7b5621382f6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1129,7 +1129,7 @@ config NODES_SHIFT | |||
1129 | depends on NEED_MULTIPLE_NODES | 1129 | depends on NEED_MULTIPLE_NODES |
1130 | ---help--- | 1130 | ---help--- |
1131 | Specify the maximum number of NUMA Nodes available on the target | 1131 | Specify the maximum number of NUMA Nodes available on the target |
1132 | system. Increases memory reserved to accomodate various tables. | 1132 | system. Increases memory reserved to accommodate various tables. |
1133 | 1133 | ||
1134 | config HAVE_ARCH_BOOTMEM | 1134 | config HAVE_ARCH_BOOTMEM |
1135 | def_bool y | 1135 | def_bool y |
@@ -1307,7 +1307,7 @@ config MTRR_SANITIZER | |||
1307 | add writeback entries. | 1307 | add writeback entries. |
1308 | 1308 | ||
1309 | Can be disabled with disable_mtrr_cleanup on the kernel command line. | 1309 | Can be disabled with disable_mtrr_cleanup on the kernel command line. |
1310 | The largest mtrr entry size for a continous block can be set with | 1310 | The largest mtrr entry size for a continuous block can be set with |
1311 | mtrr_chunk_size. | 1311 | mtrr_chunk_size. |
1312 | 1312 | ||
1313 | If unsure, say Y. | 1313 | If unsure, say Y. |