---

yaml --- r: 159696 b: refs/heads/master c: bb81b2d h: refs/heads/master v: v3
git-mirror · Aug 20, 2009 · 61c879a · 61c879a
1 parent 06be8ae
commit 61c879a
Show file tree

Hide file tree

Showing 4 changed files with 1,049 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 886f9fe68310168358f55028a03553ae154dfeb6
+refs/heads/master: bb81b2ddfa194b6d12761a350b5b5985cecae0a9
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1926,6 +1926,12 @@ config ATL2
 	  To compile this driver as a module, choose M here.  The module
 	  will be called atl2.
 
+config XILINX_EMACLITE
+	tristate "Xilinx 10/100 Ethernet Lite support"
+	depends on PPC32 || MICROBLAZE
+	help
+	  This driver supports the 10/100 Ethernet Lite from Xilinx.
+
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -142,6 +142,7 @@ obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 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
 obj-$(CONFIG_QLA3XXX) += qla3xxx.o
 obj-$(CONFIG_QLGE) += qlge/