summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSriramakrishnan <srk@ti.com>2009-11-19 15:58:25 +0530
committerKevin Hilman <khilman@deeprootsystems.com>2010-02-04 13:29:50 -0800
commit8ee2bf9ab792d0c02b13ca3acbd036debb7745d9 (patch)
tree3aee12e86ef03b9df2727c9032eaf60d2a7a11b4 /drivers
parentfc42e335ee6a7dd1f740c0fc868d607cc689d7c4 (diff)
downloadlinux-3.10-8ee2bf9ab792d0c02b13ca3acbd036debb7745d9.tar.gz
linux-3.10-8ee2bf9ab792d0c02b13ca3acbd036debb7745d9.tar.bz2
linux-3.10-8ee2bf9ab792d0c02b13ca3acbd036debb7745d9.zip
TI Davinci EMAC : Re-use driver for other platforms.
The davinci EMAC peripheral is also available on other TI platforms -notably TI AM3517 SoC. This patch modifies the config option and the platform structure header files so that the driver can be reused on non-davinci platforms as well. Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Chaithrika U S <chaithrika@ti.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/davinci_emac.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dd9a09c72df..18300625b05 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -920,7 +920,7 @@ config NET_NETX
config TI_DAVINCI_EMAC
tristate "TI DaVinci EMAC Support"
- depends on ARM && ARCH_DAVINCI
+ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
select PHYLIB
help
This driver supports TI's DaVinci Ethernet .
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 33c4fe26178..9ebac35d3af 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -62,12 +62,11 @@
#include <linux/bitops.h>
#include <linux/io.h>
#include <linux/uaccess.h>
+#include <linux/davinci_emac.h>
#include <asm/irq.h>
#include <asm/page.h>
-#include <mach/emac.h>
-
static int debug_level;
module_param(debug_level, int, 0);
MODULE_PARM_DESC(debug_level, "DaVinci EMAC debug level (NETIF_MSG bits)");