summaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac/stmmac_main.c
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2010-01-07 00:07:20 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-08 02:06:10 +0100
commit21d437cc66dcfd0119a4905214fbbe19f3e276dc (patch)
treea633c68d6ebd89ce2a55efb26040c6a6372e9416 /drivers/net/stmmac/stmmac_main.c
parentstmmac: rename mac100 as dwmac100 and fix spare coding style (diff)
downloadlinux-21d437cc66dcfd0119a4905214fbbe19f3e276dc.tar.xz
linux-21d437cc66dcfd0119a4905214fbbe19f3e276dc.zip
stmmac: rename the gmac as dwmac1000 and split core and dma parts
Use dwmac1000 naming instead of gmac. The patch also splits the gmac.c file in two new ones: dwmac1000_core.c and dwmac1000_dma.c. This could actually help on some architectures where different DMA engines are used. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index e79e00b6f147..16d4e1cecf8f 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1583,7 +1583,7 @@ static int stmmac_mac_device_setup(struct net_device *dev)
struct mac_device_info *device;
if (priv->is_gmac)
- device = gmac_setup(ioaddr);
+ device = dwmac1000_setup(ioaddr);
else
device = dwmac100_setup(ioaddr);