Merge tag 'kvm-s390-20140130' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms39...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / dove.dtsi

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 8de1031..2b76524 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -296,7 +296,6 @@
                                status = "disabled";
 
                                ethernet-port@0 {
-                                       device_type = "network";
                                        compatible = "marvell,orion-eth-port";
                                        reg = <0>;
                                        interrupts = <29>;
@@ -316,7 +315,6 @@
                                status = "disabled";
 
                                ethphy: ethernet-phy {
-                                       device_type = "ethernet-phy";
                                        /* set phy address in board file */
                                };
                        };