Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[~andy/linux] / arch / powerpc / boot / dts / mpc8315erdb.dts

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 811848e93aef0f90eaab3f51878c8bbd0af56406..43546844ea5a9ceac95128a641f6bc7f4ca0b871 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -216,14 +216,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <20 0x8>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <19 0x8>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {