summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2010-09-23 11:46:48 +0200
committerJiri Kosina <jkosina@suse.cz>2010-09-23 11:46:48 +0200
commit0b1974de66f9ed44f1423449628f4926bf95b854 (patch)
tree1154342ce5c330246c7836dfe8eb2d1853ac303b /arch
parent6f0b31c31860a0be60663f76a305ca2d78e5e99f (diff)
Fix typo: configuation => configuration
Signed-off-by: Thomas Weber <weber@corscience.de> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/hsmmc.h2
-rw-r--r--arch/mips/sibyte/common/sb_tbprof.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index 36f0ba8d89e2..6536c31eaba3 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -21,7 +21,7 @@ struct omap2_hsmmc_info {
char *name; /* or NULL for default */
struct device *dev; /* returned: pointer to mmc adapter */
int ocr_mask; /* temporary HACK */
- /* Remux (pad configuation) when powering on/off */
+ /* Remux (pad configuration) when powering on/off */
void (*remux)(struct device *dev, int slot, int power_on);
};
diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c
index d4ed7a9156f5..a2bdb2e964c0 100644
--- a/arch/mips/sibyte/common/sb_tbprof.c
+++ b/arch/mips/sibyte/common/sb_tbprof.c
@@ -43,7 +43,7 @@
#include <asm/sibyte/sb1250_scd.h>
#include <asm/sibyte/sb1250_int.h>
#else
-#error invalid SiByte UART configuation
+#error invalid SiByte UART configuration
#endif
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)