diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/Kconfig | 14 | ||||
| -rw-r--r-- | arch/xtensa/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/video/cx88/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/atm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 | ||||
| -rw-r--r-- | fs/Kconfig | 2 | ||||
| -rw-r--r-- | fs/cifs/README | 6 | ||||
| -rw-r--r-- | net/ipv4/Kconfig | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/Kconfig | 2 | ||||
| -rw-r--r-- | security/selinux/Kconfig | 2 |
15 files changed, 24 insertions, 24 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index df37594c30f8..63965c78de8c 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -13,7 +13,7 @@ config MACH_ANUBIS bool "Simtec Electronics ANUBIS" select CPU_S3C2440 help - Say Y gere if you are using the Simtec Electronics ANUBIS + Say Y here if you are using the Simtec Electronics ANUBIS development system config MACH_OSIRIS diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig index 7ddd331a7145..6f2d0add7de6 100644 --- a/arch/ppc/platforms/85xx/Kconfig +++ b/arch/ppc/platforms/85xx/Kconfig @@ -24,12 +24,12 @@ config MPC8540_ADS config MPC8548_CDS bool "Freescale MPC8548 CDS" help - This option enablese support for the MPC8548 CDS evaluation board. + This option enables support for the MPC8548 CDS evaluation board. config MPC8555_CDS bool "Freescale MPC8555 CDS" help - This option enablese support for the MPC8555 CDS evaluation board. + This option enables support for the MPC8555 CDS evaluation board. config MPC8560_ADS bool "Freescale MPC8560 ADS" @@ -51,22 +51,22 @@ config STX_GP3 config TQM8540 bool "TQ Components TQM8540" help - This option enablese support for the TQ Components TQM8540 board. + This option enables support for the TQ Components TQM8540 board. config TQM8541 bool "TQ Components TQM8541" help - This option enablese support for the TQ Components TQM8541 board. + This option enables support for the TQ Components TQM8541 board. config TQM8555 bool "TQ Components TQM8555" help - This option enablese support for the TQ Components TQM8555 board. + This option enables support for the TQ Components TQM8555 board. config TQM8560 bool "TQ Components TQM8560" help - This option enablese support for the TQ Components TQM8560 board. + This option enables support for the TQ Components TQM8560 board. endchoice @@ -94,7 +94,7 @@ config MPC8560 default y config 85xx_PCI2 - bool "Supprt for 2nd PCI host controller" + bool "Support for 2nd PCI host controller" depends on MPC8555_CDS default y diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 848f173db257..c1e69a1f92a4 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -206,7 +206,7 @@ source "drivers/pci/hotplug/Kconfig" endmenu -menu "Exectuable file formats" +menu "Executable file formats" # only elf supported config KCORE_ELF @@ -241,7 +241,7 @@ menu "Xtensa initrd options" bool "Embed root filesystem ramdisk into the kernel" config EMBEDDED_RAMDISK_IMAGE - string "Filename of gziped ramdisk image" + string "Filename of gzipped ramdisk image" depends on EMBEDDED_RAMDISK default "ramdisk.gz" help diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig index d74653d7de1c..c75322d820d4 100644 --- a/drivers/infiniband/ulp/ipoib/Kconfig +++ b/drivers/infiniband/ulp/ipoib/Kconfig @@ -26,7 +26,7 @@ config INFINIBAND_IPOIB_DEBUG_DATA bool "IP-over-InfiniBand data path debugging" depends on INFINIBAND_IPOIB_DEBUG ---help--- - This option compiles debugging code into the the data path + This option compiles debugging code into the data path of the IPoIB driver. The output can be turned on via the data_debug_level module parameter; however, even with output turned off, this debugging code will have some performance diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 51d68f32aa06..0f9d96963618 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig @@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054 depends on VIDEO_CX88_DVB && DVB_MT352 ---help--- This adds DVB-T support for cards based on the - Connexant 2388x chip and the MT352 demodulator, + Conexant 2388x chip and the MT352 demodulator, which also require support for the VP-3054 Secondary I2C bus, such at DNTV Live! DVB-T Pro. diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ff8a8c0a26d5..ab92cc794c64 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2115,7 +2115,7 @@ config SKY2 depends on PCI && EXPERIMENTAL select CRC32 ---help--- - This driver supports Gigabit Ethernet adapters based on the the + This driver supports Gigabit Ethernet adapters based on the Marvell Yukon 2 chipset: Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 8a60f391ffcf..6e780db9454d 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -157,7 +157,7 @@ config HOTPLUG_PCI_RPA tristate "RPA PCI Hotplug driver" depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE help - Say Y here if you have a a RPA system that supports PCI Hotplug. + Say Y here if you have a RPA system that supports PCI Hotplug. To compile this driver as a module, choose M here: the module will be called rpaphp. diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig index 550ddfa71a43..b450cbaa3a0b 100644 --- a/drivers/usb/atm/Kconfig +++ b/drivers/usb/atm/Kconfig @@ -64,7 +64,7 @@ config USB_XUSBATM Say Y here if you have a DSL USB modem not explicitly supported by another USB DSL drivers. In order to use your modem you will need to pass the vendor ID, product ID, and endpoint numbers for transmission - and reception as module parameters. You may need to initialize the + and reception as module parameters. You may need to initialize the modem using a user space utility (a firmware loader for example). To compile this driver as a module, choose M here: the diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 8e5dd6f29d0b..bbbc82a8336a 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -7,7 +7,7 @@ # # - Host systems (like PCs) need CONFIG_USB (with "A" jacks). # - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). -# - Some systems have both kinds of of controller. +# - Some systems have both kinds of controllers. # # With help from a special transceiver and a "Mini-AB" jack, systems with # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4608a275955f..daaa486159cf 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -188,7 +188,7 @@ config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" help This is an implementation of the Sharp LQ035Q7DB02, a 3.5" - color QVGA, HRTFT panel. The LogicPD device includes an + color QVGA, HRTFT panel. The LogicPD device includes an integrated HRTFT controller IC. The native resolution is 240x320. diff --git a/fs/Kconfig b/fs/Kconfig index deaad99ffadb..68f4561423ff 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1365,7 +1365,7 @@ config SYSV_FS If you have floppies or hard disk partitions like that, it is likely that they contain binaries from those other Unix systems; in order - to run these binaries, you will want to install linux-abi which is a + to run these binaries, you will want to install linux-abi which is a set of kernel modules that lets you run SCO, Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux. It is available via FTP (user: ftp) from diff --git a/fs/cifs/README b/fs/cifs/README index 5f0e1bd64fee..432e515431c4 100644 --- a/fs/cifs/README +++ b/fs/cifs/README @@ -269,7 +269,7 @@ A partial list of the supported mount options follows: (gid) mount option is specified. For the uid (gid) of newly created files and directories, ie files created since the last mount of the server share, the expected uid - (gid) is cached as as long as the inode remains in + (gid) is cached as long as the inode remains in memory on the client. Also note that permission checks (authorization checks) on accesses to a file occur at the server, but there are cases in which an administrator @@ -375,7 +375,7 @@ A partial list of the supported mount options follows: the local process on newly created files, directories, and devices (create, mkdir, mknod). If the CIFS Unix Extensions are not negotiated, for newly created files and directories - instead of using the default uid and gid specified on the + instead of using the default uid and gid specified on the mount, cache the new file's uid and gid locally which means that the uid for the file can change when the inode is reloaded (or the user remounts the share). @@ -440,7 +440,7 @@ A partial list of the supported mount options follows: create device files and fifos in a format compatible with Services for Unix (SFU). In addition retrieve bits 10-12 of the mode via the SETFILEBITS extended attribute (as - SFU does). In the future the bottom 9 bits of the mode + SFU does). In the future the bottom 9 bits of the mode also will be emulated using queries of the security descriptor (ACL). sign Must use packet signing (helps avoid unwanted data modification diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 0adfd88b7b0b..d172a9804448 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -556,7 +556,7 @@ config TCP_CONG_LP default n ---help--- TCP Low Priority (TCP-LP), a distributed algorithm whose goal is - to utiliza only the excess network bandwidth as compared to the + to utilize only the excess network bandwidth as compared to the ``fair share`` of bandwidth as targeted by TCP. See http://www-ece.rice.edu/networks/TCP-LP/ diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index ad52c294d219..891b9355cf96 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig @@ -204,7 +204,7 @@ config IP_VS_SED connections to the server with the shortest expected delay. The expected delay that the job will experience is (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of connections - on the the ith server and Ui is the fixed service rate (weight) + on the ith server and Ui is the fixed service rate (weight) of the ith server. If you want to compile it in kernel, say Y. To compile it as a diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index d62b09843127..23b51047494e 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig @@ -122,7 +122,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT well as any conntrack helpers for protocols which you wish to control. - If you are unsure what do do here, select N. + If you are unsure what to do here, select N. config SECURITY_SELINUX_POLICYDB_VERSION_MAX bool "NSA SELinux maximum supported policy format version" |