---

yaml --- r: 150304 b: refs/heads/master c: a6286ee h: refs/heads/master v: v3
git-mirror · May 18, 2009 · 6464fee · 6464fee
1 parent da1f7b2
commit 6464fee
Show file tree

Hide file tree

Showing 4 changed files with 2,845 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d23a9b5baa1a37ac3620e1ba080965c505053749
+refs/heads/master: a6286ee630f6d95f8466e19d7f1ae38d677028ae
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -926,6 +926,16 @@ config NET_NETX
 	  To compile this driver as a module, choose M here. The module
 	  will be called netx-eth.
 
+config TI_DAVINCI_EMAC
+	tristate "TI DaVinci EMAC Support"
+	depends on ARM && ARCH_DAVINCI
+	select PHYLIB
+	help
+	  This driver supports TI's DaVinci Ethernet .
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called davinci_emac_driver.  This is recommended.
+
 config DM9000
 	tristate "DM9000 support"
 	depends on ARM || BLACKFIN || MIPS

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -2,6 +2,8 @@
 # Makefile for the Linux network (ethercard) device drivers.
 #
 
+obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
+
 obj-$(CONFIG_E1000) += e1000/
 obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/