aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-sti/Kconfig4
-rw-r--r--drivers/cpufreq/Kconfig.x862
-rw-r--r--drivers/dma/Kconfig2
-rw-r--r--drivers/fmc/Kconfig2
-rw-r--r--drivers/infiniband/ulp/isert/Kconfig4
-rw-r--r--drivers/media/i2c/Kconfig2
-rw-r--r--drivers/mfd/Kconfig4
-rw-r--r--drivers/usb/core/Kconfig2
-rw-r--r--net/vmw_vsock/Kconfig2
9 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 835833e3c4f8..a67f83fd3f78 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -30,7 +30,7 @@ config SOC_STIH415
30 default y 30 default y
31 help 31 help
32 This enables support for STMicroelectronics Digital Consumer 32 This enables support for STMicroelectronics Digital Consumer
33 Electronics family StiH415 parts, primarily targetted at set-top-box 33 Electronics family StiH415 parts, primarily targeted at set-top-box
34 and other digital audio/video applications using Flattned Device 34 and other digital audio/video applications using Flattned Device
35 Trees. 35 Trees.
36 36
@@ -39,7 +39,7 @@ config SOC_STIH416
39 default y 39 default y
40 help 40 help
41 This enables support for STMicroelectronics Digital Consumer 41 This enables support for STMicroelectronics Digital Consumer
42 Electronics family StiH416 parts, primarily targetted at set-top-box 42 Electronics family StiH416 parts, primarily targeted at set-top-box
43 and other digital audio/video applications using Flattened Device 43 and other digital audio/video applications using Flattened Device
44 Trees. 44 Trees.
45 45
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index e2b6eabef221..b80bb4d7d6b4 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -136,7 +136,7 @@ config X86_AMD_FREQ_SENSITIVITY
136 help 136 help
137 This adds AMD-specific powersave bias function to the ondemand 137 This adds AMD-specific powersave bias function to the ondemand
138 governor, which allows it to make more power-conscious frequency 138 governor, which allows it to make more power-conscious frequency
139 change decisions based on feedback from hardware (availble on AMD 139 change decisions based on feedback from hardware (available on AMD
140 Family 16h and above). 140 Family 16h and above).
141 141
142 Hardware feedback tells software how "sensitive" to frequency changes 142 Hardware feedback tells software how "sensitive" to frequency changes
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index daa4da281e5e..6ada8b33e46a 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -300,7 +300,7 @@ config MMP_PDMA
300 depends on (ARCH_MMP || ARCH_PXA) 300 depends on (ARCH_MMP || ARCH_PXA)
301 select DMA_ENGINE 301 select DMA_ENGINE
302 help 302 help
303 Support the MMP PDMA engine for PXA and MMP platfrom. 303 Support the MMP PDMA engine for PXA and MMP platform.
304 304
305config DMA_JZ4740 305config DMA_JZ4740
306 tristate "JZ4740 DMA support" 306 tristate "JZ4740 DMA support"
diff --git a/drivers/fmc/Kconfig b/drivers/fmc/Kconfig
index c01cf45bc3d8..3a75f4256d08 100644
--- a/drivers/fmc/Kconfig
+++ b/drivers/fmc/Kconfig
@@ -46,6 +46,6 @@ config FMC_CHARDEV
46 This driver matches every mezzanine device and allows user 46 This driver matches every mezzanine device and allows user
47 space to read and write registers using a char device. It 47 space to read and write registers using a char device. It
48 can be used to write user-space drivers, or just get 48 can be used to write user-space drivers, or just get
49 aquainted with a mezzanine before writing its specific driver. 49 acquainted with a mezzanine before writing its specific driver.
50 50
51endif # FMC 51endif # FMC
diff --git a/drivers/infiniband/ulp/isert/Kconfig b/drivers/infiniband/ulp/isert/Kconfig
index ce3fd32167dc..02f9759ebb1a 100644
--- a/drivers/infiniband/ulp/isert/Kconfig
+++ b/drivers/infiniband/ulp/isert/Kconfig
@@ -1,5 +1,5 @@
1config INFINIBAND_ISERT 1config INFINIBAND_ISERT
2 tristate "iSCSI Extentions for RDMA (iSER) target support" 2 tristate "iSCSI Extensions for RDMA (iSER) target support"
3 depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET 3 depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET
4 ---help--- 4 ---help---
5 Support for iSCSI Extentions for RDMA (iSER) Target on Infiniband fabrics. 5 Support for iSCSI Extensions for RDMA (iSER) Target on Infiniband fabrics.
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index d18be19c96cd..cbc9ee9bec2b 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -646,7 +646,7 @@ config VIDEO_UPD64083
646 To compile this driver as a module, choose M here: the 646 To compile this driver as a module, choose M here: the
647 module will be called upd64083. 647 module will be called upd64083.
648 648
649comment "Miscelaneous helper chips" 649comment "Miscellaneous helper chips"
650 650
651config VIDEO_THS7303 651config VIDEO_THS7303
652 tristate "THS7303/53 Video Amplifier" 652 tristate "THS7303/53 Video Amplifier"
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index aecd6ddcbbbf..a2f12ae69b1d 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -653,14 +653,14 @@ menu "STMicroelectronics STMPE Interface Drivers"
653depends on MFD_STMPE 653depends on MFD_STMPE
654 654
655config STMPE_I2C 655config STMPE_I2C
656 bool "STMicroelectronics STMPE I2C Inteface" 656 bool "STMicroelectronics STMPE I2C Interface"
657 depends on I2C=y 657 depends on I2C=y
658 default y 658 default y
659 help 659 help
660 This is used to enable I2C interface of STMPE 660 This is used to enable I2C interface of STMPE
661 661
662config STMPE_SPI 662config STMPE_SPI
663 bool "STMicroelectronics STMPE SPI Inteface" 663 bool "STMicroelectronics STMPE SPI Interface"
664 depends on SPI_MASTER 664 depends on SPI_MASTER
665 help 665 help
666 This is used to enable SPI interface of STMPE 666 This is used to enable SPI interface of STMPE
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index db535b0aa172..fed7f68d025d 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -28,7 +28,7 @@ config USB_DEFAULT_PERSIST
28 bool "Enable USB persist by default" 28 bool "Enable USB persist by default"
29 default y 29 default y
30 help 30 help
31 Say N here if you don't want USB power session persistance 31 Say N here if you don't want USB power session persistence
32 enabled by default. If you say N it will make suspended USB 32 enabled by default. If you say N it will make suspended USB
33 devices that lose power get reenumerated as if they had been 33 devices that lose power get reenumerated as if they had been
34 unplugged, causing any mounted filesystems to be lost. The 34 unplugged, causing any mounted filesystems to be lost. The
diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
index b5fa7e40cdcb..14810abedc2e 100644
--- a/net/vmw_vsock/Kconfig
+++ b/net/vmw_vsock/Kconfig
@@ -6,7 +6,7 @@ config VSOCKETS
6 tristate "Virtual Socket protocol" 6 tristate "Virtual Socket protocol"
7 help 7 help
8 Virtual Socket Protocol is a socket protocol similar to TCP/IP 8 Virtual Socket Protocol is a socket protocol similar to TCP/IP
9 allowing comunication between Virtual Machines and hypervisor 9 allowing communication between Virtual Machines and hypervisor
10 or host. 10 or host.
11 11
12 You should also select one or more hypervisor-specific transports 12 You should also select one or more hypervisor-specific transports