From 09cdd1b9b01450e91786d26ff3c866dc9c8d8d6b Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Tue, 26 May 2009 00:17:59 -0700 Subject: [PATCH] Moved Davinci Ethernet driver to drivers/net This driver has been renamed davinci_emac.c Signed-off-by: Ben Warren --- cpu/arm926ejs/davinci/Makefile | 2 +- drivers/net/Makefile | 1 + cpu/arm926ejs/davinci/ether.c => drivers/net/davinci_emac.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename cpu/arm926ejs/davinci/ether.c => drivers/net/davinci_emac.c (100%) diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile index 6eaa89c614..e45ad25d99 100644 --- 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 a360a50655..575d9d9af2 100644 --- 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