summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/start.c2
-rw-r--r--arch/arm/mach-omap/devices-gpmc-nand.c2
-rw-r--r--drivers/mtd/nand/nand_imx.c2
-rw-r--r--include/linux/mtd/nand.h2
-rw-r--r--scripts/mod/modpost.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index ede8fd1f09..c7462f6e2e 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -108,7 +108,7 @@ void __naked __bare_init reset(void)
/*
* Board code can jump here by either returning from board_init_lowlevel
- * or by calling this funtion directly.
+ * or by calling this function directly.
*/
void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
{
diff --git a/arch/arm/mach-omap/devices-gpmc-nand.c b/arch/arm/mach-omap/devices-gpmc-nand.c
index 0fc32f1d07..cf87b57d7f 100644
--- a/arch/arm/mach-omap/devices-gpmc-nand.c
+++ b/arch/arm/mach-omap/devices-gpmc-nand.c
@@ -49,7 +49,7 @@ static struct gpmc_nand_platform_data nand_plat = {
/**
* @brief gpmc_generic_nand_devices_init - init generic nand device
*
- * @return success/fail based on device funtion
+ * @return success/fail based on device function
*/
int gpmc_generic_nand_devices_init(int cs, int width,
enum gpmc_ecc_mode eccmode, struct gpmc_config *nand_cfg)
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index 85cfbeda95..e75ffbc819 100644
--- a/drivers/mtd/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
@@ -1135,7 +1135,7 @@ static int __init imxnd_probe(struct device_d *dev)
this->ecc.layout = oob_smallpage;
- /* NAND bus width determines access funtions used by upper layer */
+ /* NAND bus width determines access functions used by upper layer */
if (pdata->width == 2) {
this->options |= NAND_BUSWIDTH_16;
this->ecc.layout = &nandv1_hw_eccoob_smallpage;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 8e208765f7..2a1c4ff67b 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -313,7 +313,7 @@ struct nand_buffers {
* @select_chip: [REPLACEABLE] select chip nr
* @block_bad: [REPLACEABLE] check, if the block is bad
* @block_markbad: [REPLACEABLE] mark the block bad
- * @cmd_ctrl: [BOARDSPECIFIC] hardwarespecific funtion for controlling
+ * @cmd_ctrl: [BOARDSPECIFIC] hardwarespecific function for controlling
* ALE/CLE/nCE. Also used to write command and address
* @dev_ready: [BOARDSPECIFIC] hardwarespecific function for accesing device ready/busy line
* If set to NULL no access to ready/busy is available and the ready/busy information
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index e99448602c..795ee8d09b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -604,7 +604,7 @@ static int strrcmp(const char *s, const char *sub)
* Whitelist to allow certain references to pass with no warning.
*
* Pattern 0:
- * Do not warn if funtion/data are marked with __init_refok/__initdata_refok.
+ * Do not warn if function/data are marked with __init_refok/__initdata_refok.
* The pattern is identified by:
* fromsec = .text.init.refok | .data.init.refok
*