Moved Davinci Ethernet driver to drivers/net

This driver has been renamed davinci_emac.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile
index 6eaa89c614a21da0d3c12a36255ff9c1d2eab2f8..e45ad25d99ee482329ff320b7a2aef4dcfb2ab0d 100644 (file)
--- a/cpu/arm926ejs/davinci/Makefile
+++ b/cpu/arm926ejs/davinci/Makefile
@@ -30,7 +30,7 @@ LIB   = $(obj)lib$(SOC).a
 COBJS-y                                += cpu.o timer.o psc.o
 COBJS-$(CONFIG_SOC_DM355)      += dm355.o
 COBJS-$(CONFIG_SOC_DM644X)     += dm644x.o
-COBJS-$(CONFIG_DRIVER_TI_EMAC) += ether.o lxt972.o dp83848.o
+COBJS-$(CONFIG_DRIVER_TI_EMAC) += lxt972.o dp83848.o
 
 SOBJS  = reset.o
 

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a360a50655bbed63ceeb140f54ca5981bc13162f..575d9d9af20119c3d2ab797e46eaa87afd104775 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -64,6 +64,7 @@ COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
 COBJS-$(CONFIG_DRIVER_SMC91111) += smc91111.o
 COBJS-$(CONFIG_DRIVER_SMC911X) += smc911x.o
 COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o
+COBJS-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
 COBJS-$(CONFIG_TSEC_ENET) += tsec.o
 COBJS-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 COBJS-$(CONFIG_ULI526X) += uli526x.o

diff --git a/cpu/arm926ejs/davinci/ether.c b/drivers/net/davinci_emac.c
similarity index 100%
rename from cpu/arm926ejs/davinci/ether.c
rename to drivers/net/davinci_emac.c