aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/Kconfig2
-rw-r--r--arch/openrisc/Kconfig2
-rw-r--r--drivers/gpio/Kconfig2
-rw-r--r--drivers/mmc/host/Kconfig2
-rw-r--r--drivers/thermal/Kconfig2
-rw-r--r--lib/Kconfig.debug10
6 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 9ff6f6ea3617..dd1ae0183ff2 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -55,7 +55,7 @@ config TEGRA_AHB
55 help 55 help
56 Adds AHB configuration functionality for NVIDIA Tegra SoCs, 56 Adds AHB configuration functionality for NVIDIA Tegra SoCs,
57 which controls AHB bus master arbitration and some 57 which controls AHB bus master arbitration and some
58 perfomance parameters(priority, prefech size). 58 performance parameters(priority, prefech size).
59 59
60choice 60choice
61 prompt "Default low-level debug console UART" 61 prompt "Default low-level debug console UART"
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 05f2ba41ff1a..0ac66f67521f 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -144,7 +144,7 @@ config DEBUG_STACKOVERFLOW
144 help 144 help
145 Make extra checks for space available on stack in some 145 Make extra checks for space available on stack in some
146 critical functions. This will cause kernel to run a bit slower, 146 critical functions. This will cause kernel to run a bit slower,
147 but will catch most of kernel stack overruns and exit gracefuly. 147 but will catch most of kernel stack overruns and exit gracefully.
148 148
149 Say Y if you are unsure. 149 Say Y if you are unsure.
150 150
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d055cee36942..be117c386de5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -470,7 +470,7 @@ config GPIO_ADNP
470 help 470 help
471 This option enables support for N GPIOs found on Avionic Design 471 This option enables support for N GPIOs found on Avionic Design
472 I2C GPIO expanders. The register space will be extended by powers 472 I2C GPIO expanders. The register space will be extended by powers
473 of two, so the controller will need to accomodate for that. For 473 of two, so the controller will need to accommodate for that. For
474 example: if a controller provides 48 pins, 6 registers will be 474 example: if a controller provides 48 pins, 6 registers will be
475 enough to represent all pins, but the driver will assume a 475 enough to represent all pins, but the driver will assume a
476 register layout for 64 pins (8 registers). 476 register layout for 64 pins (8 registers).
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9bf10e7bbfaf..49057954600a 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -541,7 +541,7 @@ config MMC_DW_PLTFM
541 If unsure, say Y. 541 If unsure, say Y.
542 542
543config MMC_DW_EXYNOS 543config MMC_DW_EXYNOS
544 tristate "Exynos specific extentions for Synopsys DW Memory Card Interface" 544 tristate "Exynos specific extensions for Synopsys DW Memory Card Interface"
545 depends on MMC_DW 545 depends on MMC_DW
546 select MMC_DW_PLTFM 546 select MMC_DW_PLTFM
547 help 547 help
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e1cb6bd75f60..d673ffca87c9 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -53,5 +53,5 @@ config EXYNOS_THERMAL
53 depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL 53 depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
54 select CPU_FREQ_TABLE 54 select CPU_FREQ_TABLE
55 help 55 help
56 If you say yes here you get support for TMU (Thermal Managment 56 If you say yes here you get support for TMU (Thermal Management
57 Unit) on SAMSUNG EXYNOS series of SoC. 57 Unit) on SAMSUNG EXYNOS series of SoC.
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 28e9d6c98941..cba01d71db86 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1115,7 +1115,7 @@ config NOTIFIER_ERROR_INJECTION
1115 depends on DEBUG_KERNEL 1115 depends on DEBUG_KERNEL
1116 select DEBUG_FS 1116 select DEBUG_FS
1117 help 1117 help
1118 This option provides the ability to inject artifical errors to 1118 This option provides the ability to inject artificial errors to
1119 specified notifier chain callbacks. It is useful to test the error 1119 specified notifier chain callbacks. It is useful to test the error
1120 handling of notifier call chain failures. 1120 handling of notifier call chain failures.
1121 1121
@@ -1126,7 +1126,7 @@ config CPU_NOTIFIER_ERROR_INJECT
1126 depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION 1126 depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION
1127 help 1127 help
1128 This option provides a kernel module that can be used to test 1128 This option provides a kernel module that can be used to test
1129 the error handling of the cpu notifiers by injecting artifical 1129 the error handling of the cpu notifiers by injecting artificial
1130 errors to CPU notifier chain callbacks. It is controlled through 1130 errors to CPU notifier chain callbacks. It is controlled through
1131 debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu 1131 debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu
1132 1132
@@ -1150,7 +1150,7 @@ config PM_NOTIFIER_ERROR_INJECT
1150 depends on PM && NOTIFIER_ERROR_INJECTION 1150 depends on PM && NOTIFIER_ERROR_INJECTION
1151 default m if PM_DEBUG 1151 default m if PM_DEBUG
1152 help 1152 help
1153 This option provides the ability to inject artifical errors to 1153 This option provides the ability to inject artificial errors to
1154 PM notifier chain callbacks. It is controlled through debugfs 1154 PM notifier chain callbacks. It is controlled through debugfs
1155 interface /sys/kernel/debug/notifier-error-inject/pm 1155 interface /sys/kernel/debug/notifier-error-inject/pm
1156 1156
@@ -1173,7 +1173,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT
1173 tristate "Memory hotplug notifier error injection module" 1173 tristate "Memory hotplug notifier error injection module"
1174 depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION 1174 depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION
1175 help 1175 help
1176 This option provides the ability to inject artifical errors to 1176 This option provides the ability to inject artificial errors to
1177 memory hotplug notifier chain callbacks. It is controlled through 1177 memory hotplug notifier chain callbacks. It is controlled through
1178 debugfs interface under /sys/kernel/debug/notifier-error-inject/memory 1178 debugfs interface under /sys/kernel/debug/notifier-error-inject/memory
1179 1179
@@ -1196,7 +1196,7 @@ config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
1196 tristate "pSeries reconfig notifier error injection module" 1196 tristate "pSeries reconfig notifier error injection module"
1197 depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION 1197 depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
1198 help 1198 help
1199 This option provides the ability to inject artifical errors to 1199 This option provides the ability to inject artificial errors to
1200 pSeries reconfig notifier chain callbacks. It is controlled 1200 pSeries reconfig notifier chain callbacks. It is controlled
1201 through debugfs interface under 1201 through debugfs interface under
1202 /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/ 1202 /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/