From c155b4196c9546a8d5a067b50d042982dc758b02 Mon Sep 17 00:00:00 2001
From: Sriramakrishnan <srk@ti.com>
Date: Thu, 19 Nov 2009 15:58:25 +0530
Subject: [PATCH] --- yaml --- r: 183202 b: refs/heads/master c:
 8ee2bf9ab792d0c02b13ca3acbd036debb7745d9 h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-davinci/common.c                          | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/da8xx.h              | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/dm365.h              | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/dm644x.h             | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/dm646x.h             | 2 +-
 trunk/drivers/net/Kconfig                                     | 2 +-
 trunk/drivers/net/davinci_emac.c                              | 3 +--
 .../include/mach/emac.h => include/linux/davinci_emac.h}      | 4 ++--
 9 files changed, 10 insertions(+), 11 deletions(-)
 rename trunk/{arch/arm/mach-davinci/include/mach/emac.h => include/linux/davinci_emac.h} (92%)

diff --git a/[refs] b/[refs]
index d40434b45612..d3bc948b3f11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc42e335ee6a7dd1f740c0fc868d607cc689d7c4
+refs/heads/master: 8ee2bf9ab792d0c02b13ca3acbd036debb7745d9
diff --git a/trunk/arch/arm/mach-davinci/common.c b/trunk/arch/arm/mach-davinci/common.c
index c2de94cde56a..94f27cbcd55a 100644
--- a/trunk/arch/arm/mach-davinci/common.c
+++ b/trunk/arch/arm/mach-davinci/common.c
@@ -11,13 +11,13 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/etherdevice.h>
+#include <linux/davinci_emac.h>
 
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/emac.h>
 
 #include "clock.h"
 
diff --git a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h
index d43a4b6b6d76..d9a7f11894c4 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -13,10 +13,10 @@
 
 #include <video/da8xx-fb.h>
 
+#include <linux/davinci_emac.h>
 #include <mach/serial.h>
 #include <mach/edma.h>
 #include <mach/i2c.h>
-#include <mach/emac.h>
 #include <mach/asp.h>
 #include <mach/mmc.h>
 #include <mach/usb.h>
diff --git a/trunk/arch/arm/mach-davinci/include/mach/dm365.h b/trunk/arch/arm/mach-davinci/include/mach/dm365.h
index 9fc5a64a5364..c3610eb39869 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/dm365.h
@@ -14,8 +14,8 @@
 #define __ASM_ARCH_DM665_H
 
 #include <linux/platform_device.h>
+#include <linux/davinci_emac.h>
 #include <mach/hardware.h>
-#include <mach/emac.h>
 #include <mach/asp.h>
 #include <mach/keyscan.h>
 #include <media/davinci/vpfe_capture.h>
diff --git a/trunk/arch/arm/mach-davinci/include/mach/dm644x.h b/trunk/arch/arm/mach-davinci/include/mach/dm644x.h
index 44e8f0fae9ea..1a8b09ccc3c8 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -22,8 +22,8 @@
 #ifndef __ASM_ARCH_DM644X_H
 #define __ASM_ARCH_DM644X_H
 
+#include <linux/davinci_emac.h>
 #include <mach/hardware.h>
-#include <mach/emac.h>
 #include <mach/asp.h>
 #include <media/davinci/vpfe_capture.h>
 
diff --git a/trunk/arch/arm/mach-davinci/include/mach/dm646x.h b/trunk/arch/arm/mach-davinci/include/mach/dm646x.h
index 8221153bb2af..846da98b619a 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -12,11 +12,11 @@
 #define __ASM_ARCH_DM646X_H
 
 #include <mach/hardware.h>
-#include <mach/emac.h>
 #include <mach/asp.h>
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <linux/clk.h>
+#include <linux/davinci_emac.h>
 
 #define DM646X_EMAC_BASE		(0x01C80000)
 #define DM646X_EMAC_CNTRL_OFFSET	(0x0000)
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index dd9a09c72dff..18300625b05b 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/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/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c
index 33c4fe26178c..9ebac35d3af0 100644
--- a/trunk/drivers/net/davinci_emac.c
+++ b/trunk/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)");
diff --git a/trunk/arch/arm/mach-davinci/include/mach/emac.h b/trunk/include/linux/davinci_emac.h
similarity index 92%
rename from trunk/arch/arm/mach-davinci/include/mach/emac.h
rename to trunk/include/linux/davinci_emac.h
index beff4fb7c845..ff5548747df4 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/emac.h
+++ b/trunk/include/linux/davinci_emac.h
@@ -8,8 +8,8 @@
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
-#ifndef _MACH_DAVINCI_EMAC_H
-#define _MACH_DAVINCI_EMAC_H
+#ifndef _LINUX_DAVINCI_EMAC_H
+#define _LINUX_DAVINCI_EMAC_H
 
 #include <linux/if_ether.h>
 #include <linux/memory.h>