aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanari Iida <standby24x7@gmail.com>2012-04-17 11:01:21 -0400
committerJiri Kosina <jkosina@suse.cz>2012-04-18 08:12:27 -0400
commit59bf896406471ac49d124b3e5f4edcafe28e5360 (patch)
tree40360c346a159f947d6284bf9c2fe38c70a7751c
parent3773b4540721a2e8d4b957f4619ada4bf0bc8e45 (diff)
Fix "the the" in various Kconfig
Fix typo "the the" in various Kconfig. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig4
-rw-r--r--arch/blackfin/Kconfig2
-rw-r--r--drivers/iommu/Kconfig4
-rw-r--r--drivers/net/can/sja1000/Kconfig2
-rw-r--r--drivers/net/irda/Kconfig2
-rw-r--r--kernel/trace/Kconfig2
-rw-r--r--sound/soc/imx/Kconfig2
8 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf006d40342c..73f90dd5554b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1927,10 +1927,10 @@ choice
1927 default ZBOOT_ROM_NONE 1927 default ZBOOT_ROM_NONE
1928 help 1928 help
1929 Include experimental SD/MMC loading code in the ROM-able zImage. 1929 Include experimental SD/MMC loading code in the ROM-able zImage.
1930 With this enabled it is possible to write the the ROM-able zImage 1930 With this enabled it is possible to write the ROM-able zImage
1931 kernel image to an MMC or SD card and boot the kernel straight 1931 kernel image to an MMC or SD card and boot the kernel straight
1932 from the reset vector. At reset the processor Mask ROM will load 1932 from the reset vector. At reset the processor Mask ROM will load
1933 the first part of the the ROM-able zImage which in turn loads the 1933 the first part of the ROM-able zImage which in turn loads the
1934 rest the kernel image to RAM. 1934 rest the kernel image to RAM.
1935 1935
1936config ZBOOT_ROM_NONE 1936config ZBOOT_ROM_NONE
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 82c0915729ee..06ca1cd4cae2 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -210,7 +210,7 @@ config SMDK6410_WM1190_EV1
210 and audio daughtercard for the Samsung SMDK6410 reference 210 and audio daughtercard for the Samsung SMDK6410 reference
211 platform. Enabling this option will build support for this 211 platform. Enabling this option will build support for this
212 module into the kernel. The presence of the module will be 212 module into the kernel. The presence of the module will be
213 detected at runtime so the the resulting kernel can be used 213 detected at runtime so the resulting kernel can be used
214 with or without the 1190-EV1 fitted. 214 with or without the 1190-EV1 fitted.
215 215
216config SMDK6410_WM1192_EV1 216config SMDK6410_WM1192_EV1
@@ -226,7 +226,7 @@ config SMDK6410_WM1192_EV1
226 daughtercard for the Samsung SMDK6410 reference platform. 226 daughtercard for the Samsung SMDK6410 reference platform.
227 Enabling this option will build support for this module into 227 Enabling this option will build support for this module into
228 the kernel. The presence of the daughtercard will be 228 the kernel. The presence of the daughtercard will be
229 detected at runtime so the the resulting kernel can be used 229 detected at runtime so the resulting kernel can be used
230 with or without the 1192-EV1 fitted. 230 with or without the 1192-EV1 fitted.
231 231
232config MACH_NCP 232config MACH_NCP
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 373a6902d8fa..b83e89ced988 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1258,7 +1258,7 @@ config PM_BFIN_WAKE_GP
1258 (all processors, except ADSP-BF549). This option sets 1258 (all processors, except ADSP-BF549). This option sets
1259 the general-purpose wake-up enable (GPWE) control bit to enable 1259 the general-purpose wake-up enable (GPWE) control bit to enable
1260 wake-up upon detection of an active low signal on the /GPW (PH7) pin. 1260 wake-up upon detection of an active low signal on the /GPW (PH7) pin.
1261 On ADSP-BF549 this option enables the the same functionality on the 1261 On ADSP-BF549 this option enables the same functionality on the
1262 /MRXON pin also PH7. 1262 /MRXON pin also PH7.
1263 1263
1264endmenu 1264endmenu
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 3bd9fff5c589..c69843742bb0 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -43,7 +43,7 @@ config AMD_IOMMU
43 With this option you can enable support for AMD IOMMU hardware in 43 With this option you can enable support for AMD IOMMU hardware in
44 your system. An IOMMU is a hardware component which provides 44 your system. An IOMMU is a hardware component which provides
45 remapping of DMA memory accesses from devices. With an AMD IOMMU you 45 remapping of DMA memory accesses from devices. With an AMD IOMMU you
46 can isolate the the DMA memory of different devices and protect the 46 can isolate the DMA memory of different devices and protect the
47 system from misbehaving device drivers or hardware. 47 system from misbehaving device drivers or hardware.
48 48
49 You can find out if your system has an AMD IOMMU if you look into 49 You can find out if your system has an AMD IOMMU if you look into
@@ -67,7 +67,7 @@ config AMD_IOMMU_V2
67 ---help--- 67 ---help---
68 This option enables support for the AMD IOMMUv2 features of the IOMMU 68 This option enables support for the AMD IOMMUv2 features of the IOMMU
69 hardware. Select this option if you want to use devices that support 69 hardware. Select this option if you want to use devices that support
70 the the PCI PRI and PASID interface. 70 the PCI PRI and PASID interface.
71 71
72# Intel IOMMU support 72# Intel IOMMU support
73config DMAR_TABLE 73config DMAR_TABLE
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index b60d6c5f29a0..03df9a8f2bbf 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -75,7 +75,7 @@ config CAN_KVASER_PCI
75 tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" 75 tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
76 depends on PCI 76 depends on PCI
77 ---help--- 77 ---help---
78 This driver is for the the PCIcanx and PCIcan cards (1, 2 or 78 This driver is for the PCIcanx and PCIcan cards (1, 2 or
79 4 channel) from Kvaser (http://www.kvaser.com). 79 4 channel) from Kvaser (http://www.kvaser.com).
80 80
81config CAN_PLX_PCI 81config CAN_PLX_PCI
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 468047866c8c..1b6d5c03edfa 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -316,7 +316,7 @@ config AU1000_FIR
316 tristate "Alchemy IrDA SIR/FIR" 316 tristate "Alchemy IrDA SIR/FIR"
317 depends on IRDA && MIPS_ALCHEMY 317 depends on IRDA && MIPS_ALCHEMY
318 help 318 help
319 Say Y/M here to build suppor the the IrDA peripheral on the 319 Say Y/M here to build support the IrDA peripheral on the
320 Alchemy Au1000 and Au1100 SoCs. 320 Alchemy Au1000 and Au1100 SoCs.
321 Say M to build a module; it will be called au1k_ir.ko 321 Say M to build a module; it will be called au1k_ir.ko
322 322
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index a1d2849f2473..33f768b779c9 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -272,7 +272,7 @@ config PROFILE_ANNOTATED_BRANCHES
272 bool "Trace likely/unlikely profiler" 272 bool "Trace likely/unlikely profiler"
273 select TRACE_BRANCH_PROFILING 273 select TRACE_BRANCH_PROFILING
274 help 274 help
275 This tracer profiles all the the likely and unlikely macros 275 This tracer profiles all likely and unlikely macros
276 in the kernel. It will display the results in: 276 in the kernel. It will display the results in:
277 277
278 /sys/kernel/debug/tracing/trace_stat/branch_annotated 278 /sys/kernel/debug/tracing/trace_stat/branch_annotated
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 810acaa09009..d83e5d0b5d52 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -28,7 +28,7 @@ config SND_SOC_IMX_AUDMUX
28 tristate 28 tristate
29 29
30config SND_MXC_SOC_WM1133_EV1 30config SND_MXC_SOC_WM1133_EV1
31 tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" 31 tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
32 depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL 32 depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
33 select SND_SOC_WM8350 33 select SND_SOC_WM8350
34 select SND_MXC_SOC_FIQ 34 select SND_MXC_SOC_FIQ