diff options
| author | Thomas Weber <weber@corscience.de> | 2010-09-23 11:46:48 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-23 11:46:48 +0200 |
| commit | 0b1974de66f9ed44f1423449628f4926bf95b854 (patch) | |
| tree | 1154342ce5c330246c7836dfe8eb2d1853ac303b | |
| 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>
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.h | 2 | ||||
| -rw-r--r-- | arch/mips/sibyte/common/sb_tbprof.c | 2 | ||||
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_link.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/ali-ircc.c | 2 | ||||
| -rw-r--r-- | drivers/net/sb1250-mac.c | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index 36f0ba8d89e..6536c31eaba 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 d4ed7a9156f..a2bdb2e964c 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) diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 0383e306631..c2146e78d6b 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -3735,7 +3735,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) /* Clear first 3 bits of the control */ val &= ~0x7; /* Set control bits according to - configuation */ + configuration */ val |= (params->xgxs_config_rx[i] & 0x7); DP(NETIF_MSG_LINK, "Setting RX" diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index a3cb109006a..92631eb6f6a 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c @@ -142,7 +142,7 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable); * Function ali_ircc_init () * * Initialize chip. Find out whay kinds of chips we are dealing with - * and their configuation registers address + * and their configuration registers address */ static int __init ali_ircc_init(void) { diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 8e6bd45b9f3..a3f36be459b 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c @@ -95,7 +95,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); #include <asm/sibyte/sb1250_regs.h> #include <asm/sibyte/sb1250_int.h> #else -#error invalid SiByte MAC configuation +#error invalid SiByte MAC configuration #endif #include <asm/sibyte/sb1250_scd.h> #include <asm/sibyte/sb1250_mac.h> @@ -106,7 +106,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) #define UNIT_INT(n) (K_INT_MAC_0 + (n)) #else -#error invalid SiByte MAC configuation +#error invalid SiByte MAC configuration #endif #ifdef K_INT_PHY @@ -1568,7 +1568,7 @@ static void sbmac_channel_start(struct sbmac_softc *s) M_MAC_RX_ENABLE | M_MAC_TX_ENABLE, s->sbm_macenable); #else -#error invalid SiByte MAC configuation +#error invalid SiByte MAC configuration #endif #ifdef CONFIG_SBMAC_COALESCE |