diff options
46 files changed, 86 insertions, 85 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. |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 0bcf26464670..9120717c0701 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -86,7 +86,7 @@ config ATA_SFF | |||
86 | 86 | ||
87 | For users with exclusively modern controllers like AHCI, | 87 | For users with exclusively modern controllers like AHCI, |
88 | Silicon Image 3124, or Marvell 6440, you may choose to | 88 | Silicon Image 3124, or Marvell 6440, you may choose to |
89 | disable this uneeded SFF support. | 89 | disable this unneeded SFF support. |
90 | 90 | ||
91 | If unsure, say Y. | 91 | If unsure, say Y. |
92 | 92 | ||
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 3d2565441b36..edb02530e461 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -42,9 +42,9 @@ config DEBUG_GPIO | |||
42 | depends on DEBUG_KERNEL | 42 | depends on DEBUG_KERNEL |
43 | help | 43 | help |
44 | Say Y here to add some extra checks and diagnostics to GPIO calls. | 44 | Say Y here to add some extra checks and diagnostics to GPIO calls. |
45 | The checks help ensure that GPIOs have been properly initialized | 45 | These checks help ensure that GPIOs have been properly initialized |
46 | before they are used and that sleeping calls aren not made from | 46 | before they are used, and that sleeping calls are not made from |
47 | nonsleeping contexts. They can make bitbanged serial protocols | 47 | non-sleeping contexts. They can make bitbanged serial protocols |
48 | slower. The diagnostics help catch the type of setup errors | 48 | slower. The diagnostics help catch the type of setup errors |
49 | that are most common when setting up new platforms or boards. | 49 | that are most common when setting up new platforms or boards. |
50 | 50 | ||
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e85c8fe9ffcf..504cfaa6160f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -243,7 +243,7 @@ config GREENASIA_FF | |||
243 | select INPUT_FF_MEMLESS | 243 | select INPUT_FF_MEMLESS |
244 | ---help--- | 244 | ---help--- |
245 | Say Y here if you have a GreenAsia (Product ID 0x12) based game controller | 245 | Say Y here if you have a GreenAsia (Product ID 0x12) based game controller |
246 | (like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter | 246 | (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter |
247 | and want to enable force feedback support for it. | 247 | and want to enable force feedback support for it. |
248 | 248 | ||
249 | config HID_TOPSEED | 249 | config HID_TOPSEED |
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 5f9d860925a1..cd50c00ab20f 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -143,7 +143,7 @@ config INPUT_APMPOWER | |||
143 | ---help--- | 143 | ---help--- |
144 | Say Y here if you want suspend key events to trigger a user | 144 | Say Y here if you want suspend key events to trigger a user |
145 | requested suspend through APM. This is useful on embedded | 145 | requested suspend through APM. This is useful on embedded |
146 | systems where such behviour is desired without userspace | 146 | systems where such behaviour is desired without userspace |
147 | interaction. If unsure, say N. | 147 | interaction. If unsure, say N. |
148 | 148 | ||
149 | To compile this driver as a module, choose M here: the | 149 | To compile this driver as a module, choose M here: the |
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig index 4938355c4072..1747a02a019a 100644 --- a/drivers/isdn/mISDN/Kconfig +++ b/drivers/isdn/mISDN/Kconfig | |||
@@ -14,13 +14,15 @@ config MISDN_DSP | |||
14 | depends on MISDN | 14 | depends on MISDN |
15 | help | 15 | help |
16 | Enable support for digital audio processing capability. | 16 | Enable support for digital audio processing capability. |
17 | |||
17 | This module may be used for special applications that require | 18 | This module may be used for special applications that require |
18 | cross connecting of bchannels, conferencing, dtmf decoding | 19 | cross connecting of bchannels, conferencing, dtmf decoding, |
19 | echo cancelation, tone generation, and Blowfish encryption and | 20 | echo cancelation, tone generation, and Blowfish encryption and |
20 | decryption. | 21 | decryption. It may use hardware features if available. |
21 | It may use hardware features if available. | 22 | |
22 | E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu | 23 | E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu |
23 | and get more informations about this module and it's usage. | 24 | and get more information about this module and its usage. |
25 | |||
24 | If unsure, say 'N'. | 26 | If unsure, say 'N'. |
25 | 27 | ||
26 | config MISDN_L1OIP | 28 | config MISDN_L1OIP |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 556aeca0d860..d9db17624f12 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -100,7 +100,7 @@ config LEDS_HP6XX | |||
100 | tristate "LED Support for the HP Jornada 6xx" | 100 | tristate "LED Support for the HP Jornada 6xx" |
101 | depends on LEDS_CLASS && SH_HP6XX | 101 | depends on LEDS_CLASS && SH_HP6XX |
102 | help | 102 | help |
103 | This option enables led support for the handheld | 103 | This option enables LED support for the handheld |
104 | HP Jornada 620/660/680/690. | 104 | HP Jornada 620/660/680/690. |
105 | 105 | ||
106 | config LEDS_PCA9532 | 106 | config LEDS_PCA9532 |
@@ -108,7 +108,7 @@ config LEDS_PCA9532 | |||
108 | depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL | 108 | depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL |
109 | help | 109 | help |
110 | This option enables support for NXP pca9532 | 110 | This option enables support for NXP pca9532 |
111 | led controller. It is generally only usefull | 111 | LED controller. It is generally only useful |
112 | as a platform driver | 112 | as a platform driver |
113 | 113 | ||
114 | config LEDS_GPIO | 114 | config LEDS_GPIO |
@@ -144,7 +144,7 @@ config LEDS_CLEVO_MAIL | |||
144 | Positivo Mobile (Clevo M5x0V) | 144 | Positivo Mobile (Clevo M5x0V) |
145 | 145 | ||
146 | If your model is not listed here you can try the "nodetect" | 146 | If your model is not listed here you can try the "nodetect" |
147 | module paramter. | 147 | module parameter. |
148 | 148 | ||
149 | To compile this driver as a module, choose M here: the | 149 | To compile this driver as a module, choose M here: the |
150 | module will be called leds-clevo-mail. | 150 | module will be called leds-clevo-mail. |
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig index 6f92beaa5ac8..da058c174049 100644 --- a/drivers/media/common/tuners/Kconfig +++ b/drivers/media/common/tuners/Kconfig | |||
@@ -147,7 +147,7 @@ config MEDIA_TUNER_XC5000 | |||
147 | default m if DVB_FE_CUSTOMISE | 147 | default m if DVB_FE_CUSTOMISE |
148 | help | 148 | help |
149 | A driver for the silicon tuner XC5000 from Xceive. | 149 | A driver for the silicon tuner XC5000 from Xceive. |
150 | This device is only used inside a SiP called togther with a | 150 | This device is only used inside a SiP called together with a |
151 | demodulator for now. | 151 | demodulator for now. |
152 | 152 | ||
153 | config MEDIA_TUNER_MXL5005S | 153 | config MEDIA_TUNER_MXL5005S |
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 00269560793a..baf808e9d6e1 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig | |||
@@ -439,7 +439,7 @@ config DVB_TUNER_DIB0070 | |||
439 | default m if DVB_FE_CUSTOMISE | 439 | default m if DVB_FE_CUSTOMISE |
440 | help | 440 | help |
441 | A driver for the silicon baseband tuner DiB0070 from DiBcom. | 441 | A driver for the silicon baseband tuner DiB0070 from DiBcom. |
442 | This device is only used inside a SiP called togther with a | 442 | This device is only used inside a SiP called together with a |
443 | demodulator for now. | 443 | demodulator for now. |
444 | 444 | ||
445 | comment "SEC control devices for DVB-S" | 445 | comment "SEC control devices for DVB-S" |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 06a2b0f7737c..75f35dbb11dc 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -88,7 +88,7 @@ config MENELAUS | |||
88 | help | 88 | help |
89 | If you say yes here you get support for the Texas Instruments | 89 | If you say yes here you get support for the Texas Instruments |
90 | TWL92330/Menelaus Power Management chip. This include voltage | 90 | TWL92330/Menelaus Power Management chip. This include voltage |
91 | regulators, Dual slot memory card tranceivers, real-time clock | 91 | regulators, Dual slot memory card transceivers, real-time clock |
92 | and other features that are often used in portable devices like | 92 | and other features that are often used in portable devices like |
93 | cell phones and PDAs. | 93 | cell phones and PDAs. |
94 | 94 | ||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1c484084ed4f..7a1e948840e6 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -18,8 +18,8 @@ config ATMEL_PWM | |||
18 | depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 | 18 | depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 |
19 | help | 19 | help |
20 | This option enables device driver support for the PWM channels | 20 | This option enables device driver support for the PWM channels |
21 | on certain Atmel prcoessors. Pulse Width Modulation is used for | 21 | on certain Atmel processors. Pulse Width Modulation is used for |
22 | purposes including software controlled power-efficent backlights | 22 | purposes including software controlled power-efficient backlights |
23 | on LCD displays, motor control, and waveform generation. | 23 | on LCD displays, motor control, and waveform generation. |
24 | 24 | ||
25 | config ATMEL_TCLIB | 25 | config ATMEL_TCLIB |
@@ -142,7 +142,7 @@ config ATMEL_SSC | |||
142 | tristate "Device driver for Atmel SSC peripheral" | 142 | tristate "Device driver for Atmel SSC peripheral" |
143 | depends on AVR32 || ARCH_AT91 | 143 | depends on AVR32 || ARCH_AT91 |
144 | ---help--- | 144 | ---help--- |
145 | This option enables device driver support for Atmel Syncronized | 145 | This option enables device driver support for Atmel Synchronized |
146 | Serial Communication peripheral (SSC). | 146 | Serial Communication peripheral (SSC). |
147 | 147 | ||
148 | The SSC peripheral supports a wide variety of serial frame based | 148 | The SSC peripheral supports a wide variety of serial frame based |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 99d4b28d52ed..6fbb246c40bb 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -177,7 +177,7 @@ config MMC_SPI | |||
177 | select CRC7 | 177 | select CRC7 |
178 | select CRC_ITU_T | 178 | select CRC_ITU_T |
179 | help | 179 | help |
180 | Some systems accss MMC/SD/SDIO cards using a SPI controller | 180 | Some systems access MMC/SD/SDIO cards using a SPI controller |
181 | instead of using a "native" MMC/SD/SDIO controller. This has a | 181 | instead of using a "native" MMC/SD/SDIO controller. This has a |
182 | disadvantage of being relatively high overhead, but a compensating | 182 | disadvantage of being relatively high overhead, but a compensating |
183 | advantage of working on many systems without dedicated MMC/SD/SDIO | 183 | advantage of working on many systems without dedicated MMC/SD/SDIO |
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e2f44e6c0bcb..20297c521e50 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -1380,7 +1380,7 @@ config SCSI_LPFC_DEBUG_FS | |||
1380 | bool "Emulex LightPulse Fibre Channel debugfs Support" | 1380 | bool "Emulex LightPulse Fibre Channel debugfs Support" |
1381 | depends on SCSI_LPFC && DEBUG_FS | 1381 | depends on SCSI_LPFC && DEBUG_FS |
1382 | help | 1382 | help |
1383 | This makes debugging infomation from the lpfc driver | 1383 | This makes debugging information from the lpfc driver |
1384 | available via the debugfs filesystem. | 1384 | available via the debugfs filesystem. |
1385 | 1385 | ||
1386 | config SCSI_SIM710 | 1386 | config SCSI_SIM710 |
@@ -1388,7 +1388,7 @@ config SCSI_SIM710 | |||
1388 | depends on (EISA || MCA) && SCSI | 1388 | depends on (EISA || MCA) && SCSI |
1389 | select SCSI_SPI_ATTRS | 1389 | select SCSI_SPI_ATTRS |
1390 | ---help--- | 1390 | ---help--- |
1391 | This driver for NCR53c710 based SCSI host adapters. | 1391 | This driver is for NCR53c710 based SCSI host adapters. |
1392 | 1392 | ||
1393 | It currently supports Compaq EISA cards and NCR MCA cards | 1393 | It currently supports Compaq EISA cards and NCR MCA cards |
1394 | 1394 | ||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 9be11b0963f2..aa9d3a4c2d50 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -1374,7 +1374,7 @@ config SERIAL_BFIN_SPORT | |||
1374 | depends on BLACKFIN && EXPERIMENTAL | 1374 | depends on BLACKFIN && EXPERIMENTAL |
1375 | select SERIAL_CORE | 1375 | select SERIAL_CORE |
1376 | help | 1376 | help |
1377 | Enble support SPORT emulate UART on Blackfin series. | 1377 | Enable SPORT emulate UART on Blackfin series. |
1378 | 1378 | ||
1379 | To compile this driver as a module, choose M here: the | 1379 | To compile this driver as a module, choose M here: the |
1380 | module will be called bfin_sport_uart. | 1380 | module will be called bfin_sport_uart. |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 211af86a6c55..92981c2383ee 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -4,7 +4,7 @@ menuconfig STAGING | |||
4 | ---help--- | 4 | ---help--- |
5 | This option allows you to select a number of drivers that are | 5 | This option allows you to select a number of drivers that are |
6 | not of the "normal" Linux kernel quality level. These drivers | 6 | not of the "normal" Linux kernel quality level. These drivers |
7 | are placed here in order to get a wider audience for use of | 7 | are placed here in order to get a wider audience to make use of |
8 | them. Please note that these drivers are under heavy | 8 | them. Please note that these drivers are under heavy |
9 | development, may or may not work, and may contain userspace | 9 | development, may or may not work, and may contain userspace |
10 | interfaces that most likely will be changed in the near | 10 | interfaces that most likely will be changed in the near |
@@ -12,7 +12,7 @@ menuconfig STAGING | |||
12 | 12 | ||
13 | Using any of these drivers will taint your kernel which might | 13 | Using any of these drivers will taint your kernel which might |
14 | affect support options from both the community, and various | 14 | affect support options from both the community, and various |
15 | commercial support orginizations. | 15 | commercial support organizations. |
16 | 16 | ||
17 | If you wish to work on these drivers, to help improve them, or | 17 | If you wish to work on these drivers, to help improve them, or |
18 | to report problems you have with them, please see the | 18 | to report problems you have with them, please see the |
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index b47ca1e7e383..83a93a5c6392 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig | |||
@@ -1,9 +1,9 @@ | |||
1 | config COMEDI | 1 | config COMEDI |
2 | tristate "Data Acquision support (comedi)" | 2 | tristate "Data acquisition support (comedi)" |
3 | default N | 3 | default N |
4 | depends on m | 4 | depends on m |
5 | ---help--- | 5 | ---help--- |
6 | Enable support a wide range of data acquision devices | 6 | Enable support a wide range of data acquisition devices |
7 | for Linux. | 7 | for Linux. |
8 | 8 | ||
9 | config COMEDI_RT | 9 | config COMEDI_RT |
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig index f2cf7f66ae05..ca6ade6c4b47 100644 --- a/drivers/staging/go7007/Kconfig +++ b/drivers/staging/go7007/Kconfig | |||
@@ -10,7 +10,7 @@ config VIDEO_GO7007 | |||
10 | select CRC32 | 10 | select CRC32 |
11 | default N | 11 | default N |
12 | ---help--- | 12 | ---help--- |
13 | This is a video4linux driver for some wierd device... | 13 | This is a video4linux driver for some weird device... |
14 | 14 | ||
15 | To compile this driver as a module, choose M here: the | 15 | To compile this driver as a module, choose M here: the |
16 | module will be called go7007 | 16 | module will be called go7007 |
@@ -20,7 +20,7 @@ config VIDEO_GO7007_USB | |||
20 | depends on VIDEO_GO7007 && USB | 20 | depends on VIDEO_GO7007 && USB |
21 | default N | 21 | default N |
22 | ---help--- | 22 | ---help--- |
23 | This is a video4linux driver for some wierd device... | 23 | This is a video4linux driver for some weird device... |
24 | 24 | ||
25 | To compile this driver as a module, choose M here: the | 25 | To compile this driver as a module, choose M here: the |
26 | module will be called go7007-usb | 26 | module will be called go7007-usb |
diff --git a/drivers/staging/panel/Kconfig b/drivers/staging/panel/Kconfig index c4b30f2a549b..3abe7c9d558d 100644 --- a/drivers/staging/panel/Kconfig +++ b/drivers/staging/panel/Kconfig | |||
@@ -110,7 +110,7 @@ config PANEL_LCD_BWIDTH | |||
110 | ---help--- | 110 | ---help--- |
111 | Most LCDs use a standard controller which supports hardware lines of 40 | 111 | Most LCDs use a standard controller which supports hardware lines of 40 |
112 | characters, although sometimes only 16, 20 or 24 of them are really wired | 112 | characters, although sometimes only 16, 20 or 24 of them are really wired |
113 | to the terminal. This results in some non-visible but adressable characters, | 113 | to the terminal. This results in some non-visible but addressable characters, |
114 | and is the case for most parallel LCDs. Other LCDs, and some serial ones, | 114 | and is the case for most parallel LCDs. Other LCDs, and some serial ones, |
115 | however, use the same line width internally as what is visible. The KS0074 | 115 | however, use the same line width internally as what is visible. The KS0074 |
116 | for example, uses 16 characters per line for 16 visible characters per line. | 116 | for example, uses 16 characters per line for 16 visible characters per line. |
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 770b3eaa9184..080bb1e4b847 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -392,7 +392,7 @@ config USB_GADGET_FSL_QE | |||
392 | controllers having QE or CPM2, given minor tweaks. | 392 | controllers having QE or CPM2, given minor tweaks. |
393 | 393 | ||
394 | Set CONFIG_USB_GADGET to "m" to build this driver as a | 394 | Set CONFIG_USB_GADGET to "m" to build this driver as a |
395 | dynmically linked module called "fsl_qe_udc". | 395 | dynamically linked module called "fsl_qe_udc". |
396 | 396 | ||
397 | config USB_FSL_QE | 397 | config USB_FSL_QE |
398 | tristate | 398 | tristate |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index a65f9196b0a0..c480ea4c19f2 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -518,8 +518,8 @@ config USB_SERIAL_SIERRAWIRELESS | |||
518 | help | 518 | help |
519 | Say M here if you want to use Sierra Wireless devices. | 519 | Say M here if you want to use Sierra Wireless devices. |
520 | 520 | ||
521 | Many deviecs have a feature known as TRU-Install, for those devices | 521 | Many devices have a feature known as TRU-Install. For those devices |
522 | to work properly the USB Storage Sierra feature must be enabled. | 522 | to work properly, the USB Storage Sierra feature must be enabled. |
523 | 523 | ||
524 | To compile this driver as a module, choose M here: the | 524 | To compile this driver as a module, choose M here: the |
525 | module will be called sierra. | 525 | module will be called sierra. |
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig index ca783127af36..bac8e7a6f17b 100644 --- a/drivers/uwb/Kconfig +++ b/drivers/uwb/Kconfig | |||
@@ -48,10 +48,10 @@ config UWB_WHCI | |||
48 | help | 48 | help |
49 | This driver enables the radio controller for WHCI cards. | 49 | This driver enables the radio controller for WHCI cards. |
50 | 50 | ||
51 | WHCI is an specification developed by Intel | 51 | WHCI is a specification developed by Intel |
52 | (http://www.intel.com/technology/comms/wusb/whci.htm) much | 52 | (http://www.intel.com/technology/comms/wusb/whci.htm) much |
53 | in the spirit of USB's EHCI, but for UWB and Wireless USB | 53 | in the spirit of USB's EHCI, but for UWB and Wireless USB |
54 | radio/host controllers connected via memmory mapping (eg: | 54 | radio/host controllers connected via memory mapping (eg: |
55 | PCI). Most of these cards come also with a Wireless USB host | 55 | PCI). Most of these cards come also with a Wireless USB host |
56 | controller. | 56 | controller. |
57 | 57 | ||
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 526187c8a12d..8ac9cddac575 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig | |||
@@ -37,7 +37,7 @@ config XEN_COMPAT_XENFS | |||
37 | The old xenstore userspace tools expect to find "xenbus" | 37 | The old xenstore userspace tools expect to find "xenbus" |
38 | under /proc/xen, but "xenbus" is now found at the root of the | 38 | under /proc/xen, but "xenbus" is now found at the root of the |
39 | xenfs filesystem. Selecting this causes the kernel to create | 39 | xenfs filesystem. Selecting this causes the kernel to create |
40 | the compatibilty mount point /proc/xen if it is running on | 40 | the compatibility mount point /proc/xen if it is running on |
41 | a xen platform. | 41 | a xen platform. |
42 | If in doubt, say yes. | 42 | If in doubt, say yes. |
43 | 43 | ||
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 7505482a08fa..418b6f3b0ae8 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig | |||
@@ -18,7 +18,7 @@ config EXT4_FS | |||
18 | filesystem; while there will be some performance gains from | 18 | filesystem; while there will be some performance gains from |
19 | the delayed allocation and inode table readahead, the best | 19 | the delayed allocation and inode table readahead, the best |
20 | performance gains will require enabling ext4 features in the | 20 | performance gains will require enabling ext4 features in the |
21 | filesystem, or formating a new filesystem as an ext4 | 21 | filesystem, or formatting a new filesystem as an ext4 |
22 | filesystem initially. | 22 | filesystem initially. |
23 | 23 | ||
24 | To compile this file system support as a module, choose M here. The | 24 | To compile this file system support as a module, choose M here. The |
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig index e35b54d5059d..830e3f76f442 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig | |||
@@ -22,7 +22,7 @@ config UBIFS_FS_ADVANCED_COMPR | |||
22 | depends on UBIFS_FS | 22 | depends on UBIFS_FS |
23 | help | 23 | help |
24 | This option allows to explicitly choose which compressions, if any, | 24 | This option allows to explicitly choose which compressions, if any, |
25 | are enabled in UBIFS. Removing compressors means inbility to read | 25 | are enabled in UBIFS. Removing compressors means inability to read |
26 | existing file systems. | 26 | existing file systems. |
27 | 27 | ||
28 | If unsure, say 'N'. | 28 | If unsure, say 'N'. |
@@ -32,7 +32,7 @@ config UBIFS_FS_LZO | |||
32 | depends on UBIFS_FS | 32 | depends on UBIFS_FS |
33 | default y | 33 | default y |
34 | help | 34 | help |
35 | LZO compressor is generally faster then zlib but compresses worse. | 35 | LZO compressor is generally faster than zlib but compresses worse. |
36 | Say 'Y' if unsure. | 36 | Say 'Y' if unsure. |
37 | 37 | ||
38 | config UBIFS_FS_ZLIB | 38 | config UBIFS_FS_ZLIB |
diff --git a/init/Kconfig b/init/Kconfig index 14c483d2b7c9..bcffc0e47647 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -687,7 +687,7 @@ config PID_NS | |||
687 | depends on NAMESPACES && EXPERIMENTAL | 687 | depends on NAMESPACES && EXPERIMENTAL |
688 | help | 688 | help |
689 | Support process id namespaces. This allows having multiple | 689 | Support process id namespaces. This allows having multiple |
690 | process with the same pid as long as they are in different | 690 | processes with the same pid as long as they are in different |
691 | pid namespaces. This is a building block of containers. | 691 | pid namespaces. This is a building block of containers. |
692 | 692 | ||
693 | Unless you want to work with an experimental feature | 693 | Unless you want to work with an experimental feature |
@@ -952,7 +952,7 @@ config COMPAT_BRK | |||
952 | Randomizing heap placement makes heap exploits harder, but it | 952 | Randomizing heap placement makes heap exploits harder, but it |
953 | also breaks ancient binaries (including anything libc5 based). | 953 | also breaks ancient binaries (including anything libc5 based). |
954 | This option changes the bootup default to heap randomization | 954 | This option changes the bootup default to heap randomization |
955 | disabled, and can be overriden runtime by setting | 955 | disabled, and can be overridden at runtime by setting |
956 | /proc/sys/kernel/randomize_va_space to 2. | 956 | /proc/sys/kernel/randomize_va_space to 2. |
957 | 957 | ||
958 | On non-ancient distros (post-2000 ones) N is usually a safe choice. | 958 | On non-ancient distros (post-2000 ones) N is usually a safe choice. |
@@ -1110,7 +1110,7 @@ config INIT_ALL_POSSIBLE | |||
1110 | cpu_possible_map, some of them chose to initialize cpu_possible_map | 1110 | cpu_possible_map, some of them chose to initialize cpu_possible_map |
1111 | with all 1s, and others with all 0s. When they were centralised, | 1111 | with all 1s, and others with all 0s. When they were centralised, |
1112 | it was better to provide this option than to break all the archs | 1112 | it was better to provide this option than to break all the archs |
1113 | and have several arch maintainers persuing me down dark alleys. | 1113 | and have several arch maintainers pursuing me down dark alleys. |
1114 | 1114 | ||
1115 | config STOP_MACHINE | 1115 | config STOP_MACHINE |
1116 | bool | 1116 | bool |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 34e707e5ab87..504086ab4443 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -72,11 +72,10 @@ config FUNCTION_GRAPH_TRACER | |||
72 | help | 72 | help |
73 | Enable the kernel to trace a function at both its return | 73 | Enable the kernel to trace a function at both its return |
74 | and its entry. | 74 | and its entry. |
75 | It's first purpose is to trace the duration of functions and | 75 | Its first purpose is to trace the duration of functions and |
76 | draw a call graph for each thread with some informations like | 76 | draw a call graph for each thread with some information like |
77 | the return value. | 77 | the return value. This is done by setting the current return |
78 | This is done by setting the current return address on the current | 78 | address on the current task structure into a stack of calls. |
79 | task structure into a stack of calls. | ||
80 | 79 | ||
81 | config IRQSOFF_TRACER | 80 | config IRQSOFF_TRACER |
82 | bool "Interrupts-off Latency Tracer" | 81 | bool "Interrupts-off Latency Tracer" |
diff --git a/net/Kconfig b/net/Kconfig index ec93e7e38b38..ce77db4fcec8 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -140,7 +140,7 @@ config NETFILTER_ADVANCED | |||
140 | default y | 140 | default y |
141 | help | 141 | help |
142 | If you say Y here you can select between all the netfilter modules. | 142 | If you say Y here you can select between all the netfilter modules. |
143 | If you say N the more ununsual ones will not be shown and the | 143 | If you say N the more unusual ones will not be shown and the |
144 | basic ones needed by most people will default to 'M'. | 144 | basic ones needed by most people will default to 'M'. |
145 | 145 | ||
146 | If unsure, say Y. | 146 | If unsure, say Y. |
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index ec992159b5f8..ca8cb326d1d2 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
@@ -22,17 +22,17 @@ menuconfig IPV6 | |||
22 | if IPV6 | 22 | if IPV6 |
23 | 23 | ||
24 | config IPV6_PRIVACY | 24 | config IPV6_PRIVACY |
25 | bool "IPv6: Privacy Extensions support" | 25 | bool "IPv6: Privacy Extensions (RFC 3041) support" |
26 | ---help--- | 26 | ---help--- |
27 | Privacy Extensions for Stateless Address Autoconfiguration in IPv6 | 27 | Privacy Extensions for Stateless Address Autoconfiguration in IPv6 |
28 | support. With this option, additional periodically-alter | 28 | support. With this option, additional periodically-altered |
29 | pseudo-random global-scope unicast address(es) will assigned to | 29 | pseudo-random global-scope unicast address(es) will be assigned to |
30 | your interface(s). | 30 | your interface(s). |
31 | 31 | ||
32 | We use our standard pseudo random algorithm to generate randomized | 32 | We use our standard pseudo-random algorithm to generate the |
33 | interface identifier, instead of one described in RFC 3041. | 33 | randomized interface identifier, instead of one described in RFC 3041. |
34 | 34 | ||
35 | By default, kernel do not generate temporary addresses. | 35 | By default the kernel does not generate temporary addresses. |
36 | To use temporary addresses, do | 36 | To use temporary addresses, do |
37 | 37 | ||
38 | echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr | 38 | echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr |
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF | |||
43 | bool "IPv6: Router Preference (RFC 4191) support" | 43 | bool "IPv6: Router Preference (RFC 4191) support" |
44 | ---help--- | 44 | ---help--- |
45 | Router Preference is an optional extension to the Router | 45 | Router Preference is an optional extension to the Router |
46 | Advertisement message to improve the ability of hosts | 46 | Advertisement message which improves the ability of hosts |
47 | to pick more appropriate router, especially when the hosts | 47 | to pick an appropriate router, especially when the hosts |
48 | is placed in a multi-homed network. | 48 | are placed in a multi-homed network. |
49 | 49 | ||
50 | If unsure, say N. | 50 | If unsure, say N. |
51 | 51 | ||
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 60c16162474c..f3d9ae350fb6 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
@@ -33,7 +33,7 @@ choice | |||
33 | ---help--- | 33 | ---help--- |
34 | This option selects the default rate control algorithm | 34 | This option selects the default rate control algorithm |
35 | mac80211 will use. Note that this default can still be | 35 | mac80211 will use. Note that this default can still be |
36 | overriden through the ieee80211_default_rc_algo module | 36 | overridden through the ieee80211_default_rc_algo module |
37 | parameter if different algorithms are available. | 37 | parameter if different algorithms are available. |
38 | 38 | ||
39 | config MAC80211_RC_DEFAULT_PID | 39 | config MAC80211_RC_DEFAULT_PID |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 2c967e4f706c..bb279bf59a1b 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -52,7 +52,7 @@ config NF_CT_ACCT | |||
52 | 52 | ||
53 | Please note that currently this option only sets a default state. | 53 | Please note that currently this option only sets a default state. |
54 | You may change it at boot time with nf_conntrack.acct=0/1 kernel | 54 | You may change it at boot time with nf_conntrack.acct=0/1 kernel |
55 | paramater or by loading the nf_conntrack module with acct=0/1. | 55 | parameter or by loading the nf_conntrack module with acct=0/1. |
56 | 56 | ||
57 | You may also disable/enable it on a running system with: | 57 | You may also disable/enable it on a running system with: |
58 | sysctl net.netfilter.nf_conntrack_acct=0/1 | 58 | sysctl net.netfilter.nf_conntrack_acct=0/1 |
diff --git a/net/phonet/Kconfig b/net/phonet/Kconfig index 51a5669573f2..6ec7d55b1769 100644 --- a/net/phonet/Kconfig +++ b/net/phonet/Kconfig | |||
@@ -6,7 +6,7 @@ config PHONET | |||
6 | tristate "Phonet protocols family" | 6 | tristate "Phonet protocols family" |
7 | help | 7 | help |
8 | The Phone Network protocol (PhoNet) is a packet-oriented | 8 | The Phone Network protocol (PhoNet) is a packet-oriented |
9 | communication protocol developped by Nokia for use with its modems. | 9 | communication protocol developed by Nokia for use with its modems. |
10 | 10 | ||
11 | This is required for Maemo to use cellular data connectivity (if | 11 | This is required for Maemo to use cellular data connectivity (if |
12 | supported). It can also be used to control Nokia phones | 12 | supported). It can also be used to control Nokia phones |
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig index 5592883e1e4a..3f7faa9688ae 100644 --- a/net/sunrpc/Kconfig +++ b/net/sunrpc/Kconfig | |||
@@ -69,7 +69,7 @@ config RPCSEC_GSS_SPKM3 | |||
69 | select CRYPTO_CBC | 69 | select CRYPTO_CBC |
70 | help | 70 | help |
71 | Choose Y here to enable Secure RPC using the SPKM3 public key | 71 | Choose Y here to enable Secure RPC using the SPKM3 public key |
72 | GSS-API mechansim (RFC 2025). | 72 | GSS-API mechanism (RFC 2025). |
73 | 73 | ||
74 | Secure RPC calls with SPKM3 require an auxiliary userspace | 74 | Secure RPC calls with SPKM3 require an auxiliary userspace |
75 | daemon which may be found in the Linux nfs-utils package | 75 | daemon which may be found in the Linux nfs-utils package |
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig index 18495cdcd10d..1b46747a5f5a 100644 --- a/net/wimax/Kconfig +++ b/net/wimax/Kconfig | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | # As well, enablement of the RFKILL code means we need the INPUT layer | 9 | # As well, enablement of the RFKILL code means we need the INPUT layer |
10 | # support to inject events coming from hw rfkill switches. That | 10 | # support to inject events coming from hw rfkill switches. That |
11 | # dependency could be killed if input.h provided appropiate means to | 11 | # dependency could be killed if input.h provided appropriate means to |
12 | # work when input is disabled. | 12 | # work when input is disabled. |
13 | 13 | ||
14 | comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" | 14 | comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" |
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index 0a2f8f9eff53..811596f4c092 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig | |||
@@ -42,7 +42,7 @@ config SND_BF5XX_AC97 | |||
42 | You will also need to select the audio interfaces to support below. | 42 | You will also need to select the audio interfaces to support below. |
43 | 43 | ||
44 | Note: | 44 | Note: |
45 | AC97 codecs which do not implment the slot-16 mode will not function | 45 | AC97 codecs which do not implement the slot-16 mode will not function |
46 | properly with this driver. This driver is known to work with the | 46 | properly with this driver. This driver is known to work with the |
47 | Analog Devices line of AC97 codecs. | 47 | Analog Devices line of AC97 codecs. |
48 | 48 | ||