diff options
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/Kconfig | 2 | ||||
| -rw-r--r-- | arch/m68knommu/Kconfig | 4 | ||||
| -rw-r--r-- | arch/um/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/joystick/Kconfig | 2 | ||||
| -rw-r--r-- | fs/Kconfig | 2 | ||||
| -rw-r--r-- | mm/Kconfig | 2 | ||||
| -rw-r--r-- | net/ipv4/Kconfig | 4 | ||||
| -rw-r--r-- | net/ipv4/ipvs/Kconfig | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/Kconfig | 2 | ||||
| -rw-r--r-- | security/selinux/Kconfig | 2 | ||||
| -rw-r--r-- | sound/oss/Kconfig | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 8b50e840295..734d5f3a530 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig @@ -550,7 +550,7 @@ config ETRAX_IDE select BLK_DEV_IDEDMA help Enable this to get support for ATA/IDE. - You can't use paralell ports or SCSI ports + You can't use parallel ports or SCSI ports at the same time. @@ -744,7 +744,7 @@ config ETRAX_PA_CHANGEABLE_BITS default "FF" help This is a bitmask with information of what bits in PA that a user - can change change the value on using ioctl's. + can change the value on using ioctl's. Bit set = changeable. You probably want 00 here. diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig index 22f0ddc04c5..4f79d8ed3e1 100644 --- a/arch/cris/arch-v32/Kconfig +++ b/arch/cris/arch-v32/Kconfig @@ -162,7 +162,7 @@ config ETRAX_SDRAM_GRP1_CONFIG depends on ETRAX_ARCH_V32 default "0" help - SDRAM configuration for group 1. The defult value is 0 + SDRAM configuration for group 1. The default value is 0 because group 1 is not used in the default configuration, described in the help for SDRAM_GRP0_CONFIG. diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index b7c942cf774..6d920d4bdc3 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -161,8 +161,8 @@ config CLOCK_FREQ frequency, it may or may not be the same as the external clock crystal fitted to your board. Some processors have an internal PLL and can have their frequency programmed at run time, others - use internal dividers. In gernal the kernel won't setup a PLL - if it is fitted (there are some expections). This value will be + use internal dividers. In general the kernel won't setup a PLL + if it is fitted (there are some exceptions). This value will be specific to the exact CPU that you are using. config CLOCK_DIV diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 76e85bbaea5..d75307589d7 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK UML and spend long times with UML stopped at a breakpoint. In this case, when UML is restarted, it will call the timer enough times to make up for the time spent at the breakpoint. This could result in a - noticable lag. If this is a problem, then disable this option. + noticeable lag. If this is a problem, then disable this option. endmenu diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 0a5d8e659aa..010d2265f1c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -310,7 +310,7 @@ config K8_NUMA help Enable K8 NUMA node topology detection. You should say Y here if you have a multi processor AMD K8 system. This uses an old - method to read the NUMA configurtion directly from the builtin + method to read the NUMA configuration directly from the builtin Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA instead, which also takes priority if both are compiled in. diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 67519ef0ef9..271263443c3 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -32,7 +32,7 @@ config JOYSTICK_ANALOG module will be called analog. config JOYSTICK_A3D - tristate "Assasin 3D and MadCatz Panther devices" + tristate "Assassin 3D and MadCatz Panther devices" select GAMEPORT help Say Y here if you have an FPGaming or MadCatz controller using the diff --git a/fs/Kconfig b/fs/Kconfig index 8d18497de62..deaad99ffad 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1032,7 +1032,7 @@ config BEFS_FS on files and directories, and database-like indeces on selected attributes. (Also note that this driver doesn't make those features available at this time). It is a 64 bit filesystem, so it supports - extremly large volumes and files. + extremely large volumes and files. If you use this filesystem, you should also say Y to at least one of the NLS (native language support) options below. diff --git a/mm/Kconfig b/mm/Kconfig index 5d88489ef2d..f10fe51985a 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -104,7 +104,7 @@ config SPARSEMEM_STATIC def_bool n # -# Architectecture platforms which require a two level mem_section in SPARSEMEM +# Architecture platforms which require a two level mem_section in SPARSEMEM # must select this option. This is usually for architecture platforms with # an extremely sparse physical address space. # diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 30af4a4dfcc..0adfd88b7b0 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH config IP_FIB_TRIE bool "FIB_TRIE" ---help--- - Use new experimental LC-trie as FIB lookup algoritm. + Use new experimental LC-trie as FIB lookup algorithm. This improves lookup performance if you have a large number of routes. @@ -526,7 +526,7 @@ config TCP_CONG_HYBLA ---help--- TCP-Hybla is a sender-side only change that eliminates penalization of long-RTT, large-bandwidth connections, like when satellite legs are - involved, expecially when sharing a common bottleneck with normal + involved, especially when sharing a common bottleneck with normal terrestrial connections. config TCP_CONG_VEGAS diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index c9820bfc493..ad52c294d21 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig @@ -81,7 +81,7 @@ config IP_VS_PROTO_ESP bool "ESP load balancing support" depends on IP_VS ---help--- - This option enables support for load balancing ESP (Encapsultion + This option enables support for load balancing ESP (Encapsulation Security Payload) transport protocol. Say Y if unsure. config IP_VS_PROTO_AH diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index a55b8ff70de..d88c292f118 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG daemon using netlink multicast sockets; unlike the LOG target which can only be viewed through syslog. - The apropriate userspace logging daemon (ulogd) may be obtained from + The appropriate userspace logging daemon (ulogd) may be obtained from <http://www.gnumonks.org/projects/ulogd/> To compile it as a module, choose M here. If unsure, say N. diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index 293dbd6246c..d62b0984312 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig @@ -112,7 +112,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT your distribution will provide these and enable the new controls in the kernel they also distribute. - Note that this option can be overriden at boot with the + Note that this option can be overridden at boot with the selinux_compat_net parameter, and after boot via /selinux/compat_net. See Documentation/kernel-parameters.txt for details on this parameter. diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 97e38b66558..f08396c3f61 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -647,7 +647,7 @@ config SOUND_PSS command line. config PSS_MIXER - bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)" + bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)" depends on SOUND_PSS help Answer Y for Beethoven ADSP-16. You may try to say Y also for other |