From 6997991ab0db72ee92b7fd63e70679d415c8e95c Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Thu, 23 Feb 2012 23:42:19 +0900 Subject: mips: Fix printk typos in arc/mips Correct spelling "platfom" to "platform", "deactived" to "deactivated" and "deprectated" to "deprecated" in arch/mips directory. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- arch/mips/kernel/mips-mt.c | 2 +- arch/mips/lantiq/xway/gpio.c | 2 +- arch/mips/lantiq/xway/gpio_ebu.c | 2 +- arch/mips/lantiq/xway/gpio_stp.c | 2 +- arch/mips/pci/pci-lantiq.c | 2 +- arch/mips/sni/pcimt.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index c23d11f6851d..b3b0b9464450 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c @@ -210,7 +210,7 @@ void mips_mt_set_cpuoptions(void) unsigned int nconfig7 = oconfig7; if (mt_opt_norps) { - printk("\"norps\" option deprectated: use \"rpsctl=\"\n"); + printk("\"norps\" option deprecated: use \"rpsctl=\"\n"); } if (mt_opt_rpsctl >= 0) { printk("34K return prediction stack override set to %d.\n", diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c index d2fa98f3c78d..c429a5bc080f 100644 --- a/arch/mips/lantiq/xway/gpio.c +++ b/arch/mips/lantiq/xway/gpio.c @@ -188,7 +188,7 @@ int __init ltq_gpio_init(void) int ret = platform_driver_register(<q_gpio_driver); if (ret) - pr_info("ltq_gpio : Error registering platfom driver!"); + pr_info("ltq_gpio : Error registering platform driver!"); return ret; } diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c index b91c7f17f10f..aae17170472f 100644 --- a/arch/mips/lantiq/xway/gpio_ebu.c +++ b/arch/mips/lantiq/xway/gpio_ebu.c @@ -119,7 +119,7 @@ static int __init ltq_ebu_init(void) int ret = platform_driver_register(<q_ebu_driver); if (ret) - pr_info("ltq_ebu : Error registering platfom driver!"); + pr_info("ltq_ebu : Error registering platform driver!"); return ret; } diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index ff9991cddeaa..fd07d87adaa9 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c @@ -150,7 +150,7 @@ int __init ltq_stp_init(void) int ret = platform_driver_register(<q_stp_driver); if (ret) - pr_info("ltq_stp: error registering platfom driver"); + pr_info("ltq_stp: error registering platform driver"); return ret; } diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index be1e1afe12c3..df3dca0ca622 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -296,7 +296,7 @@ int __init pcibios_init(void) { int ret = platform_driver_register(<q_pci_driver); if (ret) - printk(KERN_INFO "ltq_pci: Error registering platfom driver!"); + printk(KERN_INFO "ltq_pci: Error registering platform driver!"); return ret; } diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index ed3b3d317358..cdb1417fba59 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c @@ -29,7 +29,7 @@ static void __init sni_pcimt_sc_init(void) scsiz = cacheconf & 7; if (scsiz == 0) { - printk("Second level cache is deactived.\n"); + printk("Second level cache is deactivated.\n"); return; } if (scsiz >= 6) { -- cgit v1.2.3 From a19568ebfaf7df963be344f1052b3de2530d933c Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 28 Feb 2012 10:49:31 -0800 Subject: alpha: Use vsprintf extention %pf with builtin_return_address Emit the function name not the address when possible. builtin_return_address() gives an address. When building a kernel with CONFIG_KALLSYMS, emit the actual function name not the address. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina --- arch/alpha/kernel/pci_iommu.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'arch') diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 43610804987d..9460b90077ca 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -236,7 +236,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) ok = 0; /* If both conditions above are met, we are fine. */ - DBGA("pci_dac_dma_supported %s from %p\n", + DBGA("pci_dac_dma_supported %s from %pf\n", ok ? "yes" : "no", __builtin_return_address(0)); return ok; @@ -268,7 +268,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, && paddr + size <= __direct_map_size) { ret = paddr + __direct_map_base; - DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %p\n", + DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n", cpu_addr, size, ret, __builtin_return_address(0)); return ret; @@ -279,7 +279,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, if (dac_allowed) { ret = paddr + alpha_mv.pci_dac_offset; - DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %p\n", + DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n", cpu_addr, size, ret, __builtin_return_address(0)); return ret; @@ -316,7 +316,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, ret = arena->dma_base + dma_ofs * PAGE_SIZE; ret += (unsigned long)cpu_addr & ~PAGE_MASK; - DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %p\n", + DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %pf\n", cpu_addr, size, npages, ret, __builtin_return_address(0)); return ret; @@ -385,14 +385,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, && dma_addr < __direct_map_base + __direct_map_size) { /* Nothing to do. */ - DBGA2("pci_unmap_single: direct [%llx,%zx] from %p\n", + DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n", dma_addr, size, __builtin_return_address(0)); return; } if (dma_addr > 0xffffffff) { - DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %p\n", + DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n", dma_addr, size, __builtin_return_address(0)); return; } @@ -424,7 +424,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, spin_unlock_irqrestore(&arena->lock, flags); - DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %p\n", + DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n", dma_addr, size, npages, __builtin_return_address(0)); } @@ -446,7 +446,7 @@ try_again: cpu_addr = (void *)__get_free_pages(gfp, order); if (! cpu_addr) { printk(KERN_INFO "pci_alloc_consistent: " - "get_free_pages failed from %p\n", + "get_free_pages failed from %pf\n", __builtin_return_address(0)); /* ??? Really atomic allocation? Otherwise we could play with vmalloc and sg if we can't find contiguous memory. */ @@ -465,7 +465,7 @@ try_again: goto try_again; } - DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %p\n", + DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %pf\n", size, cpu_addr, *dma_addrp, __builtin_return_address(0)); return cpu_addr; @@ -484,7 +484,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size, pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL); free_pages((unsigned long)cpu_addr, get_order(size)); - DBGA2("pci_free_consistent: [%llx,%zx] from %p\n", + DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n", dma_addr, size, __builtin_return_address(0)); } -- cgit v1.2.3 From 023dcd25ce409506f992f9e3a822424de035fe05 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 28 Feb 2012 10:49:32 -0800 Subject: arm: Use vsprintf extention %pf with builtin_return_address Emit the function name not the address when possible. builtin_return_address() gives an address. When building a kernel with CONFIG_KALLSYMS, emit the actual function name not the address. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina --- arch/arm/nwfpe/fpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c index cb7658e8acc5..4e729f055a81 100644 --- a/arch/arm/nwfpe/fpmodule.c +++ b/arch/arm/nwfpe/fpmodule.c @@ -147,7 +147,7 @@ void float_raise(signed char flags) #ifdef CONFIG_DEBUG_USER if (flags & debug) printk(KERN_DEBUG - "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n", + "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n", current->comm, current->pid, flags, __builtin_return_address(0), GET_USERREG()->ARM_pc); #endif -- cgit v1.2.3 From a7e0e4e99fabe0094fcb0b011b741558b8b28fa7 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Tue, 20 Mar 2012 16:46:14 -0700 Subject: x86: Fix typo in MODULE_DEVICE_TABLE example: s/x86_cpu/x86cpu/ Signed-off-by: Josh Triplett Signed-off-by: Jiri Kosina --- arch/x86/kernel/cpu/match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index 5502b289341b..36565373af87 100644 --- a/arch/x86/kernel/cpu/match.c +++ b/arch/x86/kernel/cpu/match.c @@ -23,7 +23,7 @@ * %X86_MODEL_ANY, %X86_FEATURE_ANY or 0 (except for vendor) * * Arrays used to match for this should also be declared using - * MODULE_DEVICE_TABLE(x86_cpu, ...) + * MODULE_DEVICE_TABLE(x86cpu, ...) * * This always matches against the boot cpu, assuming models and features are * consistent over all CPUs. -- cgit v1.2.3 From 6b2aac42b20f495d9ea220036f57596d525d4233 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 14 Apr 2012 00:14:11 +0900 Subject: Fix typo in various Kconfig file Correct spelling typo in various Kconfig file. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- arch/m68k/Kconfig.cpu | 2 +- arch/mips/Kconfig | 4 ++-- arch/mips/Kconfig.debug | 2 +- arch/openrisc/Kconfig | 2 +- arch/powerpc/platforms/Kconfig.cputype | 4 ++-- arch/powerpc/platforms/pseries/Kconfig | 2 +- arch/sh/Kconfig.cpu | 2 +- drivers/devfreq/Kconfig | 2 +- drivers/hid/Kconfig | 2 +- drivers/hwmon/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/mfd/Kconfig | 6 +++--- drivers/ptp/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- drivers/xen/Kconfig | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) (limited to 'arch') diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 8a9c767125a4..51b3274cbe71 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -7,7 +7,7 @@ choice help The Freescale (was Motorola) M68K family of processors implements the full 68000 processor instruction set. - The Freescale ColdFire family of processors is a modern derivitive + The Freescale ColdFire family of processors is a modern derivative of the 68000 processor family. They are mainly targeted at embedded applications, and are all System-On-Chip (SOC) devices, as opposed to stand alone CPUs. They implement a subset of the original 68000 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ce30e2f91d77..923a6c3b9a0a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1001,12 +1001,12 @@ config HOLES_IN_ZONE bool # -# Endianess selection. Sufficiently obscure so many users don't know what to +# Endianness selection. Sufficiently obscure so many users don't know what to # answer,so we try hard to limit the available choices. Also the use of a # choice statement should be more obvious to the user. # choice - prompt "Endianess selection" + prompt "Endianness selection" help Some MIPS machines can be configured for either little or big endian byte order. These modes require different kernels and a different diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 83ed00a5644a..5a43aa0798ca 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug @@ -57,7 +57,7 @@ config CMDLINE options. config CMDLINE_OVERRIDE - bool "Built-in command line overrides firware arguments" + bool "Built-in command line overrides firmware arguments" default n depends on CMDLINE_BOOL help diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index a4787197d8fe..66dff2046987 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -141,7 +141,7 @@ config DEBUG_STACKOVERFLOW bool "Check for kernel stack overflow" default y help - Make extra checks for space avaliable on stack in some + Make extra checks for space available on stack in some critical functions. This will cause kernel to run a bit slower, but will catch most of kernel stack overruns and exit gracefuly. diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 425db18580a2..9c80fc07384a 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -258,7 +258,7 @@ config PPC_ICSWX_PID default y ---help--- The PID register in server is used explicitly for ICSWX. In - embedded systems PID managment is done by the system. + embedded systems PID management is done by the system. config PPC_ICSWX_USE_SIGILL bool "Should a bad CT cause a SIGILL?" @@ -266,7 +266,7 @@ config PPC_ICSWX_USE_SIGILL default n ---help--- Should a bad CT used for "non-record form ICSWX" cause an - illegal intruction signal or should it be silent as + illegal instruction signal or should it be silent as architected. If in doubt, say N here. diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index aadbe4f6d537..10ad207dccc2 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -67,7 +67,7 @@ config IO_EVENT_IRQ This option will only enable the IO event platform code. You will still need to enable or compile the actual drivers - that use this infrastruture to handle IO event interrupts. + that use this infrastructure to handle IO event interrupts. Say Y if you are unsure. diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index ddf096c7d8bf..770ff2d5b94d 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu @@ -1,7 +1,7 @@ menu "Processor features" choice - prompt "Endianess selection" + prompt "Endianness selection" default CPU_LITTLE_ENDIAN help Some SuperH machines can be configured for either little or big diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 464fa2147dfb..f6b0a6e2ea50 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -16,7 +16,7 @@ menuconfig PM_DEVFREQ is attached to a single device and returns a "representative" clock frequency of the device, which is also attached to a device by 1-to-1. The device registering devfreq takes the - responsiblity to "interpret" the representative frequency and + responsibility to "interpret" the representative frequency and to set its every clock accordingly with the "target" callback given to devfreq. diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a3d033252995..478eb4a90f2c 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -448,7 +448,7 @@ config HID_PICOLCD_FB select FB_SYS_FOPS ---help--- Provide access to PicoLCD's 256x64 monochrome display via a - frambuffer device. + framebuffer device. config HID_PICOLCD_BACKLIGHT bool "Backlight control" if EXPERT diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 8deedc1b9840..e466ecba8dc1 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -318,7 +318,7 @@ config SENSORS_EXYNOS4_TMU tristate "Temperature sensor on Samsung EXYNOS4" depends on ARCH_EXYNOS4 help - If you say yes here you get support for TMU (Thermal Managment + If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS4 series of SoC. This driver can also be built as a module. If so, the module diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d2c5095deeac..94468a64ce3a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -351,7 +351,7 @@ config I2C_DAVINCI For details please see http://www.ti.com/davinci config I2C_DESIGNWARE_PLATFORM - tristate "Synopsys DesignWare Platfrom" + tristate "Synopsys DesignWare Platform" depends on HAVE_CLK help If you say yes to this option, support will be included for the diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 29f463cc09cb..639e1fc36a39 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -407,7 +407,7 @@ config MFD_MAX8925 select MFD_CORE help Say yes here to support for Maxim Semiconductor MAX8925. This is - a Power Management IC. This driver provies common support for + a Power Management IC. This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device. @@ -430,7 +430,7 @@ config MFD_MAX8998 help Say yes here to support for Maxim Semiconductor MAX8998 and National Semiconductor LP3974. This is a Power Management IC. - This driver provies common support for accessing the device, + This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device. @@ -441,7 +441,7 @@ config MFD_S5M_CORE select REGMAP_I2C help Support for the Samsung Electronics S5M MFD series. - This driver provies common support for accessing the device, + This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index cd9bc3b129bc..b4b918a75db2 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -70,7 +70,7 @@ config DP83640_PHY using the SO_TIMESTAMPING API. In order for this to work, your MAC driver must also - implement the skb_tx_timetamp() function. + implement the skb_tx_timestamp() function. config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 37096246c937..eeea76f4dccb 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -937,7 +937,7 @@ config BCM47XX_WDT tristate "Broadcom BCM47xx Watchdog Timer" depends on BCM47XX help - Hardware driver for the Broadcom BCM47xx Watchog Timer. + Hardware driver for the Broadcom BCM47xx Watchdog Timer. config RC32434_WDT tristate "IDT RC32434 SoC Watchdog Timer" diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 94243136f6bf..73f1c99bc540 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -71,7 +71,7 @@ config XEN_DEV_EVTCHN tristate "Xen /dev/xen/evtchn device" default y help - The evtchn driver allows a userspace process to triger event + The evtchn driver allows a userspace process to trigger event channels and to receive notification of an event channel firing. If in doubt, say yes. -- cgit v1.2.3 From 59bf896406471ac49d124b3e5f4edcafe28e5360 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 18 Apr 2012 00:01:21 +0900 Subject: Fix "the the" in various Kconfig Fix typo "the the" in various Kconfig. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- arch/arm/Kconfig | 4 ++-- arch/arm/mach-s3c64xx/Kconfig | 4 ++-- arch/blackfin/Kconfig | 2 +- drivers/iommu/Kconfig | 4 ++-- drivers/net/can/sja1000/Kconfig | 2 +- drivers/net/irda/Kconfig | 2 +- kernel/trace/Kconfig | 2 +- sound/soc/imx/Kconfig | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'arch') 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 default ZBOOT_ROM_NONE help Include experimental SD/MMC loading code in the ROM-able zImage. - With this enabled it is possible to write the the ROM-able zImage + With this enabled it is possible to write the ROM-able zImage kernel image to an MMC or SD card and boot the kernel straight from the reset vector. At reset the processor Mask ROM will load - the first part of the the ROM-able zImage which in turn loads the + the first part of the ROM-able zImage which in turn loads the rest the kernel image to RAM. config 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 and audio daughtercard for the Samsung SMDK6410 reference platform. Enabling this option will build support for this module into the kernel. The presence of the module will be - detected at runtime so the the resulting kernel can be used + detected at runtime so the resulting kernel can be used with or without the 1190-EV1 fitted. config SMDK6410_WM1192_EV1 @@ -226,7 +226,7 @@ config SMDK6410_WM1192_EV1 daughtercard for the Samsung SMDK6410 reference platform. Enabling this option will build support for this module into the kernel. The presence of the daughtercard will be - detected at runtime so the the resulting kernel can be used + detected at runtime so the resulting kernel can be used with or without the 1192-EV1 fitted. config 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 (all processors, except ADSP-BF549). This option sets the general-purpose wake-up enable (GPWE) control bit to enable wake-up upon detection of an active low signal on the /GPW (PH7) pin. - On ADSP-BF549 this option enables the the same functionality on the + On ADSP-BF549 this option enables the same functionality on the /MRXON pin also PH7. endmenu 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 With this option you can enable support for AMD IOMMU hardware in your system. An IOMMU is a hardware component which provides remapping of DMA memory accesses from devices. With an AMD IOMMU you - can isolate the the DMA memory of different devices and protect the + can isolate the DMA memory of different devices and protect the system from misbehaving device drivers or hardware. You can find out if your system has an AMD IOMMU if you look into @@ -67,7 +67,7 @@ config AMD_IOMMU_V2 ---help--- This option enables support for the AMD IOMMUv2 features of the IOMMU hardware. Select this option if you want to use devices that support - the the PCI PRI and PASID interface. + the PCI PRI and PASID interface. # Intel IOMMU support config 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 tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" depends on PCI ---help--- - This driver is for the the PCIcanx and PCIcan cards (1, 2 or + This driver is for the PCIcanx and PCIcan cards (1, 2 or 4 channel) from Kvaser (http://www.kvaser.com). config 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 tristate "Alchemy IrDA SIR/FIR" depends on IRDA && MIPS_ALCHEMY help - Say Y/M here to build suppor the the IrDA peripheral on the + Say Y/M here to build support the IrDA peripheral on the Alchemy Au1000 and Au1100 SoCs. Say M to build a module; it will be called au1k_ir.ko 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 bool "Trace likely/unlikely profiler" select TRACE_BRANCH_PROFILING help - This tracer profiles all the the likely and unlikely macros + This tracer profiles all likely and unlikely macros in the kernel. It will display the results in: /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 tristate config SND_MXC_SOC_WM1133_EV1 - tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" + tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted" depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL select SND_SOC_WM8350 select SND_MXC_SOC_FIQ -- cgit v1.2.3 From 42a6bd2006c922143cee8d9ec7c4e27526d4d2a3 Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Sun, 1 Apr 2012 17:29:32 +0900 Subject: x86, relocs: Remove an unused variable sh_symtab is set but not used. Signed-off-by: Kusanagi Kouichi Signed-off-by: Jiri Kosina --- arch/x86/boot/compressed/relocs.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch') diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c index d3c0b0277666..fb7117a4ade1 100644 --- a/arch/x86/boot/compressed/relocs.c +++ b/arch/x86/boot/compressed/relocs.c @@ -403,13 +403,11 @@ static void print_absolute_symbols(void) for (i = 0; i < ehdr.e_shnum; i++) { struct section *sec = &secs[i]; char *sym_strtab; - Elf32_Sym *sh_symtab; int j; if (sec->shdr.sh_type != SHT_SYMTAB) { continue; } - sh_symtab = sec->symtab; sym_strtab = sec->link->strtab; for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Sym); j++) { Elf32_Sym *sym; -- cgit v1.2.3 From 1f0459780c28491c480f7098f3ece79334ccae0a Mon Sep 17 00:00:00 2001 From: Philipp Hahn Date: Wed, 2 May 2012 18:09:35 +0200 Subject: atomic64_32.h: fix parameter naming mismatch The doc string doesn't match the parameter name, fix @p -> @v @ptr -> @v @n -> @i Signed-off-by: Philipp Hahn Signed-off-by: Jiri Kosina --- arch/x86/include/asm/atomic64_32.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arch') diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index 198119910da5..b154de75c90c 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h @@ -63,7 +63,7 @@ ATOMIC64_DECL(add_unless); /** * atomic64_cmpxchg - cmpxchg atomic64 variable - * @p: pointer to type atomic64_t + * @v: pointer to type atomic64_t * @o: expected value * @n: new value * @@ -98,7 +98,7 @@ static inline long long atomic64_xchg(atomic64_t *v, long long n) /** * atomic64_set - set atomic64 variable * @v: pointer to type atomic64_t - * @n: value to assign + * @i: value to assign * * Atomically sets the value of @v to @n. */ @@ -200,7 +200,7 @@ static inline long long atomic64_sub(long long i, atomic64_t *v) * atomic64_sub_and_test - subtract value from variable and test result * @i: integer value to subtract * @v: pointer to type atomic64_t - * + * * Atomically subtracts @i from @v and returns * true if the result is zero, or false for all * other cases. @@ -224,9 +224,9 @@ static inline void atomic64_inc(atomic64_t *v) /** * atomic64_dec - decrement atomic64 variable - * @ptr: pointer to type atomic64_t + * @v: pointer to type atomic64_t * - * Atomically decrements @ptr by 1. + * Atomically decrements @v by 1. */ static inline void atomic64_dec(atomic64_t *v) { -- cgit v1.2.3 From b7799b05d8d13819ebde62da9e06255d1f6f2cf3 Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:20 +0000 Subject: arm/m68k: Change mail address of Sebastian Hess MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That old mail address doesnt exist any more. This changes all occurences to a current address. Signed-off-by: Oskar Schirmer Acked-by: Sebastian Heß Cc: Geert Uytterhoeven Signed-off-by: Jiri Kosina --- arch/m68k/platform/532x/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c index 2bec3477b739..db8707f5e037 100644 --- a/arch/m68k/platform/532x/config.c +++ b/arch/m68k/platform/532x/config.c @@ -7,7 +7,7 @@ * Copyright (C) 2000, Lineo (www.lineo.com) * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com * Copyright Freescale Semiconductor, Inc 2006 - * Copyright (c) 2006, emlix, Sebastian Hess + * Copyright (c) 2006, emlix, Sebastian Hess * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3 From a45170e7ad65b2b7179c7bbe8780882159c829fb Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:16 +0000 Subject: xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer These old mail addresses dont exist any more. This changes all occurences to the authors' current addresses. Signed-off-by: Oskar Schirmer Cc: Chris Zankel Acked-by: Johannes Weiner Signed-off-by: Jiri Kosina --- arch/xtensa/variants/s6000/dmac.c | 2 +- arch/xtensa/variants/s6000/gpio.c | 4 ++-- arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +- arch/xtensa/variants/s6000/irq.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/xtensa/variants/s6000/dmac.c b/arch/xtensa/variants/s6000/dmac.c index dc7f7c573518..340f5bb0b5ef 100644 --- a/arch/xtensa/variants/s6000/dmac.c +++ b/arch/xtensa/variants/s6000/dmac.c @@ -1,5 +1,5 @@ /* - * Authors: Oskar Schirmer + * Authors: Oskar Schirmer * Daniel Gloeckner * (c) 2008 emlix GmbH http://www.emlix.com * diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c index 7af0757e001b..b89541ba39ab 100644 --- a/arch/xtensa/variants/s6000/gpio.c +++ b/arch/xtensa/variants/s6000/gpio.c @@ -2,8 +2,8 @@ * s6000 gpio driver * * Copyright (c) 2009 emlix GmbH - * Authors: Oskar Schirmer - * Johannes Weiner + * Authors: Oskar Schirmer + * Johannes Weiner * Daniel Gloeckner */ #include diff --git a/arch/xtensa/variants/s6000/include/variant/dmac.h b/arch/xtensa/variants/s6000/include/variant/dmac.h index e81735b2a206..3f88d9fc6897 100644 --- a/arch/xtensa/variants/s6000/include/variant/dmac.h +++ b/arch/xtensa/variants/s6000/include/variant/dmac.h @@ -8,7 +8,7 @@ * Copyright (C) 2006 Tensilica Inc. * Copyright (C) 2008 Emlix GmbH * Authors: Fabian Godehardt - * Oskar Schirmer + * Oskar Schirmer * Daniel Gloeckner */ diff --git a/arch/xtensa/variants/s6000/irq.c b/arch/xtensa/variants/s6000/irq.c index 6651e3285fcf..81a241e79075 100644 --- a/arch/xtensa/variants/s6000/irq.c +++ b/arch/xtensa/variants/s6000/irq.c @@ -2,8 +2,8 @@ * s6000 irq crossbar * * Copyright (c) 2009 emlix GmbH - * Authors: Johannes Weiner - * Oskar Schirmer + * Authors: Johannes Weiner + * Oskar Schirmer */ #include #include -- cgit v1.2.3 From f70d4a95edc7da87f39cd8b603ba131df2c198ed Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 22 May 2012 10:56:21 +0200 Subject: edac, mips: don't change code that has been removed in edac/mips tree This is a partial revert of 15ed103a9800 ("edac: Fix spelling errors") 6997991ab0db ("mips: Fix printk typos in arc/mips") which change code that doesn't exist any more in edac/mips trees. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina --- arch/mips/pci/pci-lantiq.c | 2 +- drivers/edac/edac_core.h | 2 +- drivers/edac/edac_device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index 70fdf2c7919b..030c77e7926e 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -297,7 +297,7 @@ int __init pcibios_init(void) { int ret = platform_driver_register(<q_pci_driver); if (ret) - printk(KERN_INFO "ltq_pci: Error registering platform driver!"); + printk(KERN_INFO "ltq_pci: Error registering platfom driver!"); return ret; } diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 841bb2d7ce61..5b739411d62f 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -460,7 +460,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, /* * The no info errors are used when error overflows are reported. * There are a limited number of error logging registers that can - * be exhausted. When all registers are exhausted and an additional + * be exausted. When all registers are exhausted and an additional * error occurs then an error overflow register records that an * error occurred and the type of error, but doesn't have any * further information. The ce/ue versions make for cleaner diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index da4a1f11939f..45b8f4bdd773 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -367,7 +367,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info * structure, that needs to be polled for possible error events. * * This operation is to acquire the list mutex lock - * (thus preventing insertion or deletion) + * (thus preventing insertation or deletion) * and then call the device's poll function IFF this device is * running polled and there is a poll function defined. */ -- cgit v1.2.3