aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sb1250-mac.c
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2010-09-23 05:46:48 -0400
committerJiri Kosina <jkosina@suse.cz>2010-09-23 05:46:48 -0400
commit0b1974de66f9ed44f1423449628f4926bf95b854 (patch)
tree1154342ce5c330246c7836dfe8eb2d1853ac303b /drivers/net/sb1250-mac.c
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 'drivers/net/sb1250-mac.c')
-rw-r--r--drivers/net/sb1250-mac.c6
1 files changed, 3 insertions, 3 deletions
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