From e4785f1caaa949a5f9e9eb87fbfea0f196344133 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:10:41 +0100
Subject: [PATCH] --- yaml --- r: 348467 b: refs/heads/master c:
 77916519cba3425c7e3a6d17393d123f9b76e54f h: refs/heads/master i:   348465:
 4846bad679c6710b3314bda547db38e5f9d998bc   348463:
 13202cd69723de2be469aa6aa8cc8c284cbb5a39 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/boot/dts/armada-xp-mv78260.dtsi | 8 ++++++++
 trunk/arch/arm/boot/dts/armada-xp-mv78460.dtsi | 8 ++++++++
 trunk/arch/arm/boot/dts/armada-xp.dtsi         | 8 --------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index edc251c057fb..0e943dd30ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44cfae9ac608fbad98d0e139bc81fe0abd21e3c3
+refs/heads/master: 77916519cba3425c7e3a6d17393d123f9b76e54f
diff --git a/trunk/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/trunk/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index a2aee5707377..1c1937dbce73 100644
--- a/trunk/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/trunk/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -85,5 +85,13 @@
 			#interrupts-cells = <2>;
 			interrupts = <24>;
 		};
+
+		ethernet@d0034000 {
+				compatible = "marvell,armada-370-neta";
+				reg = <0xd0034000 0x2500>;
+				interrupts = <14>;
+				clocks = <&gateclk 1>;
+				status = "disabled";
+		};
 	};
 };
diff --git a/trunk/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/trunk/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index da03a129243a..4905cf3a5ef8 100644
--- a/trunk/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/trunk/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -100,5 +100,13 @@
 			#interrupts-cells = <2>;
 			interrupts = <24>;
 		};
+
+		ethernet@d0034000 {
+				compatible = "marvell,armada-370-neta";
+				reg = <0xd0034000 0x2500>;
+				interrupts = <14>;
+				clocks = <&gateclk 1>;
+				status = "disabled";
+		};
 	};
  };
diff --git a/trunk/arch/arm/boot/dts/armada-xp.dtsi b/trunk/arch/arm/boot/dts/armada-xp.dtsi
index 8a85ffe77f03..2e37ef101c90 100644
--- a/trunk/arch/arm/boot/dts/armada-xp.dtsi
+++ b/trunk/arch/arm/boot/dts/armada-xp.dtsi
@@ -95,14 +95,6 @@
 				status = "disabled";
 		};
 
-		ethernet@d0034000 {
-				compatible = "marvell,armada-370-neta";
-				reg = <0xd0034000 0x2500>;
-				interrupts = <14>;
-				clocks = <&gateclk 1>;
-				status = "disabled";
-		};
-
 		xor@d0060900 {
 			compatible = "marvell,orion-xor";
 			reg = <0xd0060900 0x100