Merge branch 'linus' into tracing/ftrace

1 files changed, 1 insertions, 7 deletions

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 711f9a30f9ab..0e872a60e091 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -164,12 +164,6 @@
                                 reg = <0x2>;
                                 device_type = "ethernet-phy";
                         };
-                        phy3: ethernet-phy@3 {
-                                interrupt-parent = <&ipic>;
-                                interrupts = <18 0x8>;
-                                reg = <0x3>;
-                                device_type = "ethernet-phy";
-                        };
                 };
 
                 enet0: ethernet@24000 {
@@ -195,7 +189,7 @@
                         interrupts = <35 0x8 36 0x8 37 0x8>;
                         phy-connection-type = "mii";
                         interrupt-parent = <&ipic>;
-                        phy-handle = <&phy3>;
+                        fixed-link = <1 1 1000 0 0>;
                 };
 
                 serial0: serial@4500 {