aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig4
-rw-r--r--arch/cris/arch-v32/Kconfig2
-rw-r--r--arch/m68knommu/Kconfig4
-rw-r--r--arch/um/Kconfig2
-rw-r--r--arch/x86_64/Kconfig2
-rw-r--r--drivers/input/joystick/Kconfig2
-rw-r--r--fs/Kconfig2
-rw-r--r--mm/Kconfig2
-rw-r--r--net/ipv4/Kconfig4
-rw-r--r--net/ipv4/ipvs/Kconfig2
-rw-r--r--net/ipv4/netfilter/Kconfig2
-rw-r--r--security/selinux/Kconfig2
-rw-r--r--sound/oss/Kconfig2
13 files changed, 16 insertions, 16 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 8b50e8402954..734d5f3a5304 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -550,7 +550,7 @@ config ETRAX_IDE
550 select BLK_DEV_IDEDMA 550 select BLK_DEV_IDEDMA
551 help 551 help
552 Enable this to get support for ATA/IDE. 552 Enable this to get support for ATA/IDE.
553 You can't use paralell ports or SCSI ports 553 You can't use parallel ports or SCSI ports
554 at the same time. 554 at the same time.
555 555
556 556
@@ -744,7 +744,7 @@ config ETRAX_PA_CHANGEABLE_BITS
744 default "FF" 744 default "FF"
745 help 745 help
746 This is a bitmask with information of what bits in PA that a user 746 This is a bitmask with information of what bits in PA that a user
747 can change change the value on using ioctl's. 747 can change the value on using ioctl's.
748 Bit set = changeable. 748 Bit set = changeable.
749 You probably want 00 here. 749 You probably want 00 here.
750 750
diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig
index 22f0ddc04c50..4f79d8ed3e1c 100644
--- a/arch/cris/arch-v32/Kconfig
+++ b/arch/cris/arch-v32/Kconfig
@@ -162,7 +162,7 @@ config ETRAX_SDRAM_GRP1_CONFIG
162 depends on ETRAX_ARCH_V32 162 depends on ETRAX_ARCH_V32
163 default "0" 163 default "0"
164 help 164 help
165 SDRAM configuration for group 1. The defult value is 0 165 SDRAM configuration for group 1. The default value is 0
166 because group 1 is not used in the default configuration, 166 because group 1 is not used in the default configuration,
167 described in the help for SDRAM_GRP0_CONFIG. 167 described in the help for SDRAM_GRP0_CONFIG.
168 168
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index b7c942cf7741..6d920d4bdc3d 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -161,8 +161,8 @@ config CLOCK_FREQ
161 frequency, it may or may not be the same as the external clock 161 frequency, it may or may not be the same as the external clock
162 crystal fitted to your board. Some processors have an internal 162 crystal fitted to your board. Some processors have an internal
163 PLL and can have their frequency programmed at run time, others 163 PLL and can have their frequency programmed at run time, others
164 use internal dividers. In gernal the kernel won't setup a PLL 164 use internal dividers. In general the kernel won't setup a PLL
165 if it is fitted (there are some expections). This value will be 165 if it is fitted (there are some exceptions). This value will be
166 specific to the exact CPU that you are using. 166 specific to the exact CPU that you are using.
167 167
168config CLOCK_DIV 168config CLOCK_DIV
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 76e85bbaea55..d75307589d74 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK
257 UML and spend long times with UML stopped at a breakpoint. In this 257 UML and spend long times with UML stopped at a breakpoint. In this
258 case, when UML is restarted, it will call the timer enough times to make 258 case, when UML is restarted, it will call the timer enough times to make
259 up for the time spent at the breakpoint. This could result in a 259 up for the time spent at the breakpoint. This could result in a
260 noticable lag. If this is a problem, then disable this option. 260 noticeable lag. If this is a problem, then disable this option.
261 261
262endmenu 262endmenu
263 263
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0a5d8e659aa4..010d2265f1cf 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -310,7 +310,7 @@ config K8_NUMA
310 help 310 help
311 Enable K8 NUMA node topology detection. You should say Y here if 311 Enable K8 NUMA node topology detection. You should say Y here if
312 you have a multi processor AMD K8 system. This uses an old 312 you have a multi processor AMD K8 system. This uses an old
313 method to read the NUMA configurtion directly from the builtin 313 method to read the NUMA configuration directly from the builtin
314 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA 314 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
315 instead, which also takes priority if both are compiled in. 315 instead, which also takes priority if both are compiled in.
316 316
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
32 module will be called analog. 32 module will be called analog.
33 33
34config JOYSTICK_A3D 34config JOYSTICK_A3D
35 tristate "Assasin 3D and MadCatz Panther devices" 35 tristate "Assassin 3D and MadCatz Panther devices"
36 select GAMEPORT 36 select GAMEPORT
37 help 37 help
38 Say Y here if you have an FPGaming or MadCatz controller using the 38 Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/fs/Kconfig b/fs/Kconfig
index 8d18497de629..deaad99ffadb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1032,7 +1032,7 @@ config BEFS_FS
1032 on files and directories, and database-like indeces on selected 1032 on files and directories, and database-like indeces on selected
1033 attributes. (Also note that this driver doesn't make those features 1033 attributes. (Also note that this driver doesn't make those features
1034 available at this time). It is a 64 bit filesystem, so it supports 1034 available at this time). It is a 64 bit filesystem, so it supports
1035 extremly large volumes and files. 1035 extremely large volumes and files.
1036 1036
1037 If you use this filesystem, you should also say Y to at least one 1037 If you use this filesystem, you should also say Y to at least one
1038 of the NLS (native language support) options below. 1038 of the NLS (native language support) options below.
diff --git a/mm/Kconfig b/mm/Kconfig
index 5d88489ef2de..f10fe51985a0 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -104,7 +104,7 @@ config SPARSEMEM_STATIC
104 def_bool n 104 def_bool n
105 105
106# 106#
107# Architectecture platforms which require a two level mem_section in SPARSEMEM 107# Architecture platforms which require a two level mem_section in SPARSEMEM
108# must select this option. This is usually for architecture platforms with 108# must select this option. This is usually for architecture platforms with
109# an extremely sparse physical address space. 109# an extremely sparse physical address space.
110# 110#
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 30af4a4dfcc8..0adfd88b7b0b 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH
64config IP_FIB_TRIE 64config IP_FIB_TRIE
65 bool "FIB_TRIE" 65 bool "FIB_TRIE"
66 ---help--- 66 ---help---
67 Use new experimental LC-trie as FIB lookup algoritm. 67 Use new experimental LC-trie as FIB lookup algorithm.
68 This improves lookup performance if you have a large 68 This improves lookup performance if you have a large
69 number of routes. 69 number of routes.
70 70
@@ -526,7 +526,7 @@ config TCP_CONG_HYBLA
526 ---help--- 526 ---help---
527 TCP-Hybla is a sender-side only change that eliminates penalization of 527 TCP-Hybla is a sender-side only change that eliminates penalization of
528 long-RTT, large-bandwidth connections, like when satellite legs are 528 long-RTT, large-bandwidth connections, like when satellite legs are
529 involved, expecially when sharing a common bottleneck with normal 529 involved, especially when sharing a common bottleneck with normal
530 terrestrial connections. 530 terrestrial connections.
531 531
532config TCP_CONG_VEGAS 532config TCP_CONG_VEGAS
diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig
index c9820bfc493a..ad52c294d219 100644
--- a/net/ipv4/ipvs/Kconfig
+++ b/net/ipv4/ipvs/Kconfig
@@ -81,7 +81,7 @@ config IP_VS_PROTO_ESP
81 bool "ESP load balancing support" 81 bool "ESP load balancing support"
82 depends on IP_VS 82 depends on IP_VS
83 ---help--- 83 ---help---
84 This option enables support for load balancing ESP (Encapsultion 84 This option enables support for load balancing ESP (Encapsulation
85 Security Payload) transport protocol. Say Y if unsure. 85 Security Payload) transport protocol. Say Y if unsure.
86 86
87config IP_VS_PROTO_AH 87config IP_VS_PROTO_AH
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index a55b8ff70ded..d88c292f118c 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG
373 daemon using netlink multicast sockets; unlike the LOG target 373 daemon using netlink multicast sockets; unlike the LOG target
374 which can only be viewed through syslog. 374 which can only be viewed through syslog.
375 375
376 The apropriate userspace logging daemon (ulogd) may be obtained from 376 The appropriate userspace logging daemon (ulogd) may be obtained from
377 <http://www.gnumonks.org/projects/ulogd/> 377 <http://www.gnumonks.org/projects/ulogd/>
378 378
379 To compile it as a module, choose M here. If unsure, say N. 379 To compile it as a module, choose M here. If unsure, say N.
diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index 293dbd6246c1..d62b09843127 100644
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -112,7 +112,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
112 your distribution will provide these and enable the new controls 112 your distribution will provide these and enable the new controls
113 in the kernel they also distribute. 113 in the kernel they also distribute.
114 114
115 Note that this option can be overriden at boot with the 115 Note that this option can be overridden at boot with the
116 selinux_compat_net parameter, and after boot via 116 selinux_compat_net parameter, and after boot via
117 /selinux/compat_net. See Documentation/kernel-parameters.txt 117 /selinux/compat_net. See Documentation/kernel-parameters.txt
118 for details on this parameter. 118 for details on this parameter.
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 97e38b665587..f08396c3f61a 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -647,7 +647,7 @@ config SOUND_PSS
647 command line. 647 command line.
648 648
649config PSS_MIXER 649config PSS_MIXER
650 bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)" 650 bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)"
651 depends on SOUND_PSS 651 depends on SOUND_PSS
652 help 652 help
653 Answer Y for Beethoven ADSP-16. You may try to say Y also for other 653 Answer Y for Beethoven ADSP-16. You may try to say Y also for other