diff options
author | Thomas Weber <weber@corscience.de> | 2010-09-23 05:46:48 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-23 05:46:48 -0400 |
commit | 0b1974de66f9ed44f1423449628f4926bf95b854 (patch) | |
tree | 1154342ce5c330246c7836dfe8eb2d1853ac303b /arch | |
parent | 6f0b31c31860a0be60663f76a305ca2d78e5e99f (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.h | 2 | ||||
-rw-r--r-- | arch/mips/sibyte/common/sb_tbprof.c | 2 |
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 { | |||
21 | char *name; /* or NULL for default */ | 21 | char *name; /* or NULL for default */ |
22 | struct device *dev; /* returned: pointer to mmc adapter */ | 22 | struct device *dev; /* returned: pointer to mmc adapter */ |
23 | int ocr_mask; /* temporary HACK */ | 23 | int ocr_mask; /* temporary HACK */ |
24 | /* Remux (pad configuation) when powering on/off */ | 24 | /* Remux (pad configuration) when powering on/off */ |
25 | void (*remux)(struct device *dev, int slot, int power_on); | 25 | void (*remux)(struct device *dev, int slot, int power_on); |
26 | }; | 26 | }; |
27 | 27 | ||
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 @@ | |||
43 | #include <asm/sibyte/sb1250_scd.h> | 43 | #include <asm/sibyte/sb1250_scd.h> |
44 | #include <asm/sibyte/sb1250_int.h> | 44 | #include <asm/sibyte/sb1250_int.h> |
45 | #else | 45 | #else |
46 | #error invalid SiByte UART configuation | 46 | #error invalid SiByte UART configuration |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | 49 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) |