diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-01-06 18:07:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-07 20:06:09 -0500 |
commit | 7e848ae113ca7442ba6b44168fa2238224f37e8a (patch) | |
tree | a5d1a2f0a57a174038afa763682a9bc14e12ef43 /drivers/net/stmmac/stmmac_main.c | |
parent | aec7ff278145280c2c78377aeb98feed02c8b636 (diff) |
stmmac: rename mac100 as dwmac100 and fix spare coding style
This patch renames the mac100.[ch] as dwmac100.[ch]; this
looks more specific and appropriate for these chip series.
The patch also fixes some spare coding style issues.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac/stmmac_main.c')
-rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index e6c5a3cf4af2..e79e00b6f147 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
@@ -1585,7 +1585,7 @@ static int stmmac_mac_device_setup(struct net_device *dev) | |||
1585 | if (priv->is_gmac) | 1585 | if (priv->is_gmac) |
1586 | device = gmac_setup(ioaddr); | 1586 | device = gmac_setup(ioaddr); |
1587 | else | 1587 | else |
1588 | device = mac100_setup(ioaddr); | 1588 | device = dwmac100_setup(ioaddr); |
1589 | 1589 | ||
1590 | if (!device) | 1590 | if (!device) |
1591 | return -ENOMEM; | 1591 | return -ENOMEM; |