aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/xilinx/Makefile
diff options
context:
space:
mode:
authordanborkmann@iogearbox.net <danborkmann@iogearbox.net>2012-01-19 00:39:31 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-25 16:59:47 -0500
commit8a3b7a252dca9fb28c23b5bf76c49180a2b60d3b (patch)
tree0fbf680fa4b679f8fd7f72ee8335f3c6021ce483 /drivers/net/ethernet/xilinx/Makefile
parentbnx2x: unlock before returning an error (diff)
downloadlinux-dev-8a3b7a252dca9fb28c23b5bf76c49180a2b60d3b.tar.xz
linux-dev-8a3b7a252dca9fb28c23b5bf76c49180a2b60d3b.zip
drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver
This driver adds support for Xilinx 10/100/1000 AXI Ethernet. It can be used, for instance, on Xilinx boards with a Microblaze architecture like the ML605. The patch is against the latest net-next tree and checkpatch clean. Signed-off-by: Ariane Keller <ariane.keller@tik.ee.ethz.ch> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx/Makefile')
-rw-r--r--drivers/net/ethernet/xilinx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile
index 5feac734ea45..214205e975e3 100644
--- a/drivers/net/ethernet/xilinx/Makefile
+++ b/drivers/net/ethernet/xilinx/Makefile
@@ -5,3 +5,5 @@
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
+xilinx_emac-objs := xilinx_axienet_main.o xilinx_axienet_mdio.o
+obj-$(CONFIG_XILINX_AXI_EMAC) += xilinx_emac.o