From 21f8ab66a9f2a013eb08b03c3de1913952b4be4d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:15:15 +0200
Subject: [PATCH] --- yaml --- r: 327134 b: refs/heads/master c:
 2960ed3468773b1a0b2533dd7a562673cc799437 h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-netx/nxdb500.c                              | 2 +-
 trunk/arch/arm/mach-netx/nxdkn.c                                | 2 +-
 trunk/arch/arm/mach-netx/nxeb500hmi.c                           | 2 +-
 trunk/drivers/net/ethernet/netx-eth.c                           | 2 +-
 .../mach/eth.h => include/linux/platform_data/eth-netx.h}       | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename trunk/{arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h} (100%)

diff --git a/[refs] b/[refs]
index 4b37d3d84b81..142c43196c9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ef21f6343ff08309955d1ad56ad0f5504a4dd94
+refs/heads/master: 2960ed3468773b1a0b2533dd7a562673cc799437
diff --git a/trunk/arch/arm/mach-netx/nxdb500.c b/trunk/arch/arm/mach-netx/nxdb500.c
index 180ea899a48a..8b781ff7c9e9 100644
--- a/trunk/arch/arm/mach-netx/nxdb500.c
+++ b/trunk/arch/arm/mach-netx/nxdb500.c
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
 
 #include "generic.h"
 #include "fb.h"
diff --git a/trunk/arch/arm/mach-netx/nxdkn.c b/trunk/arch/arm/mach-netx/nxdkn.c
index 58009e29b20e..b26dbce334f2 100644
--- a/trunk/arch/arm/mach-netx/nxdkn.c
+++ b/trunk/arch/arm/mach-netx/nxdkn.c
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
 
 #include "generic.h"
 
diff --git a/trunk/arch/arm/mach-netx/nxeb500hmi.c b/trunk/arch/arm/mach-netx/nxeb500hmi.c
index 122e99826ef6..257382efafa0 100644
--- a/trunk/arch/arm/mach-netx/nxeb500hmi.c
+++ b/trunk/arch/arm/mach-netx/nxeb500hmi.c
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
 
 #include "generic.h"
 #include "fb.h"
diff --git a/trunk/drivers/net/ethernet/netx-eth.c b/trunk/drivers/net/ethernet/netx-eth.c
index 9d11ab7521bc..63e7af44366f 100644
--- a/trunk/drivers/net/ethernet/netx-eth.c
+++ b/trunk/drivers/net/ethernet/netx-eth.c
@@ -34,7 +34,7 @@
 #include <mach/netx-regs.h>
 #include <mach/pfifo.h>
 #include <mach/xc.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
 
 /* XC Fifo Offsets */
 #define EMPTY_PTR_FIFO(xcno)    (0 + ((xcno) << 3))	/* Index of the empty pointer FIFO */
diff --git a/trunk/arch/arm/mach-netx/include/mach/eth.h b/trunk/include/linux/platform_data/eth-netx.h
similarity index 100%
rename from trunk/arch/arm/mach-netx/include/mach/eth.h
rename to trunk/include/linux/platform_data/eth-netx.h