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 /drivers/net | |
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 'drivers/net')
-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 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 0383e3066313..c2146e78d6b1 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) | |||
3735 | /* Clear first 3 bits of the control */ | 3735 | /* Clear first 3 bits of the control */ |
3736 | val &= ~0x7; | 3736 | val &= ~0x7; |
3737 | /* Set control bits according to | 3737 | /* Set control bits according to |
3738 | configuation */ | 3738 | configuration */ |
3739 | val |= (params->xgxs_config_rx[i] & | 3739 | val |= (params->xgxs_config_rx[i] & |
3740 | 0x7); | 3740 | 0x7); |
3741 | DP(NETIF_MSG_LINK, "Setting RX" | 3741 | DP(NETIF_MSG_LINK, "Setting RX" |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index a3cb109006a5..92631eb6f6a3 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); | |||
142 | * Function ali_ircc_init () | 142 | * Function ali_ircc_init () |
143 | * | 143 | * |
144 | * Initialize chip. Find out whay kinds of chips we are dealing with | 144 | * Initialize chip. Find out whay kinds of chips we are dealing with |
145 | * and their configuation registers address | 145 | * and their configuration registers address |
146 | */ | 146 | */ |
147 | static int __init ali_ircc_init(void) | 147 | static int __init ali_ircc_init(void) |
148 | { | 148 | { |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 8e6bd45b9f31..a3f36be459b8 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"); | |||
95 | #include <asm/sibyte/sb1250_regs.h> | 95 | #include <asm/sibyte/sb1250_regs.h> |
96 | #include <asm/sibyte/sb1250_int.h> | 96 | #include <asm/sibyte/sb1250_int.h> |
97 | #else | 97 | #else |
98 | #error invalid SiByte MAC configuation | 98 | #error invalid SiByte MAC configuration |
99 | #endif | 99 | #endif |
100 | #include <asm/sibyte/sb1250_scd.h> | 100 | #include <asm/sibyte/sb1250_scd.h> |
101 | #include <asm/sibyte/sb1250_mac.h> | 101 | #include <asm/sibyte/sb1250_mac.h> |
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); | |||
106 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) | 106 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) |
107 | #define UNIT_INT(n) (K_INT_MAC_0 + (n)) | 107 | #define UNIT_INT(n) (K_INT_MAC_0 + (n)) |
108 | #else | 108 | #else |
109 | #error invalid SiByte MAC configuation | 109 | #error invalid SiByte MAC configuration |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | #ifdef K_INT_PHY | 112 | #ifdef K_INT_PHY |
@@ -1568,7 +1568,7 @@ static void sbmac_channel_start(struct sbmac_softc *s) | |||
1568 | M_MAC_RX_ENABLE | | 1568 | M_MAC_RX_ENABLE | |
1569 | M_MAC_TX_ENABLE, s->sbm_macenable); | 1569 | M_MAC_TX_ENABLE, s->sbm_macenable); |
1570 | #else | 1570 | #else |
1571 | #error invalid SiByte MAC configuation | 1571 | #error invalid SiByte MAC configuration |
1572 | #endif | 1572 | #endif |
1573 | 1573 | ||
1574 | #ifdef CONFIG_SBMAC_COALESCE | 1574 | #ifdef CONFIG_SBMAC_COALESCE |