diff options
| -rw-r--r-- | arch/arm/mach-exynos/dmc_init_ddr3.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/misc.c | 2 | ||||
| -rw-r--r-- | arch/mips/mach-au1x00/au1x00_usb_ohci.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/usb_ohci.c | 3 | ||||
| -rw-r--r-- | drivers/net/fec_mxc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-s3c24xx.c | 2 | ||||
| -rw-r--r-- | include/vsprintf.h | 4 |
9 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c index 25a9df93647..6a5d26cc69d 100644 --- a/arch/arm/mach-exynos/dmc_init_ddr3.c +++ b/arch/arm/mach-exynos/dmc_init_ddr3.c @@ -618,7 +618,7 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int reset) /* * Send NOP, MRS and ZQINIT commands * Sending MRS command will reset the DRAM. We should not be - * reseting the DRAM after resume, this will lead to memory + * resetting the DRAM after resume, this will lead to memory * corruption as DRAM content is lost after DRAM reset */ dmc_config_mrs(mem, &drex0->directcmd); diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 5cbd8a43255..dd6b53b24df 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -362,7 +362,7 @@ int arch_early_init_r(void) * issuing warm reset. The ancient kernel code expects this * value to be written into the register by the bootloader, so * to support that old code, we write it here instead of in the - * reset_cpu() function just before reseting the CPU. + * reset_cpu() function just before resetting the CPU. */ writel(0xae9efebc, &sysmgr_regs->romcodegrp_warmramgrp_enable); diff --git a/arch/mips/mach-au1x00/au1x00_usb_ohci.c b/arch/mips/mach-au1x00/au1x00_usb_ohci.c index 42484e57121..088e6121052 100644 --- a/arch/mips/mach-au1x00/au1x00_usb_ohci.c +++ b/arch/mips/mach-au1x00/au1x00_usb_ohci.c @@ -671,7 +671,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf __u32 info = 0; unsigned int toggle = 0; - /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */ + /* OHCI handles the DATA-toggles itself, we just use the + USB-toggle bits for resetting */ if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { toggle = TD_T_TOGGLE; } else { diff --git a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c index b7c1b5594a0..cf36954fe7e 100644 --- a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c +++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c @@ -670,7 +670,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf __u32 info = 0; unsigned int toggle = 0; - /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */ + /* OHCI handles the DATA-toggles itself, we just use the + USB-toggle bits for resetting */ if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { toggle = TD_T_TOGGLE; } else { diff --git a/arch/powerpc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c index 65a0675446e..27423e37792 100644 --- a/arch/powerpc/cpu/ppc4xx/usb_ohci.c +++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c @@ -673,7 +673,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf __u32 info = 0; unsigned int toggle = 0; - /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */ + /* OHCI handles the DATA-toggles itself, we just use the + USB-toggle bits for resetting */ if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { toggle = TD_T_TOGGLE; } else { diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 8e3b8398650..84021ea5bec 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1024,7 +1024,7 @@ static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr, start = get_timer(0); while (readl(&fec->eth->ecntrl) & FEC_ECNTRL_RESET) { if (get_timer(start) > (CONFIG_SYS_HZ * 5)) { - printf("FEC MXC: Timeout reseting chip\n"); + printf("FEC MXC: Timeout resetting chip\n"); goto err4; } udelay(10); diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 0f6d03ec3bc..80cfe11290e 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -964,7 +964,7 @@ static void td_submit_job(ohci_t *ohci, struct usb_device *dev, flush_dcache_buffer(buffer, data_len); /* OHCI handles the DATA-toggles itself, we just use the USB-toggle - * bits for reseting */ + * bits for resetting */ if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { toggle = TD_T_TOGGLE; } else { diff --git a/drivers/usb/host/ohci-s3c24xx.c b/drivers/usb/host/ohci-s3c24xx.c index 8bb2275c094..28b9ab51769 100644 --- a/drivers/usb/host/ohci-s3c24xx.c +++ b/drivers/usb/host/ohci-s3c24xx.c @@ -677,7 +677,7 @@ static void td_submit_job(struct usb_device *dev, unsigned long pipe, unsigned int toggle = 0; /* OHCI handles the DATA-toggles itself, we just - use the USB-toggle bits for reseting */ + use the USB-toggle bits for resetting */ if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { toggle = TD_T_TOGGLE; } else { diff --git a/include/vsprintf.h b/include/vsprintf.h index 60e91d119ee..e38076d22d4 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -72,7 +72,7 @@ long trailing_strtoln(const char *str, const char *end); * panic() - Print a message and reset/hang * * Prints a message on the console(s) and then resets. If CONFIG_PANIC_HANG is - * defined, then it will hang instead of reseting. + * defined, then it will hang instead of resetting. * * @param fmt: printf() format string for message, which should not include * \n, followed by arguments @@ -84,7 +84,7 @@ void panic(const char *fmt, ...) * panic_str() - Print a message and reset/hang * * Prints a message on the console(s) and then resets. If CONFIG_PANIC_HANG is - * defined, then it will hang instead of reseting. + * defined, then it will hang instead of resetting. * * This function can be used instead of panic() when your board does not * already use printf(), * to keep code size small. |