diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
commit | 3c3d7cb1db4af176dab843f22ea092a4ef1eb989 (patch) | |
tree | 9c1b2951432ed10d0654a8e13cbe57b51260d06b /arch/powerpc/boot/dts/ep8248e.dts | |
parent | 0e9f2204cfa6d79abe3e525ddf7c4ab5792cc751 (diff) | |
parent | 494479038d97f1b9f76fc633a360a681acdf035c (diff) |
Merge branch 'linus' into perf/core
Refresh the branch to a v3.14-rc base before queueing up new devel patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/boot/dts/ep8248e.dts')
-rw-r--r-- | arch/powerpc/boot/dts/ep8248e.dts | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/boot/dts/ep8248e.dts b/arch/powerpc/boot/dts/ep8248e.dts index 756758fb5b7b..8b3a49f34f5a 100644 --- a/arch/powerpc/boot/dts/ep8248e.dts +++ b/arch/powerpc/boot/dts/ep8248e.dts @@ -67,7 +67,6 @@ ranges; mdio { - device_type = "mdio"; compatible = "fsl,ep8248e-mdio-bitbang"; #address-cells = <1>; #size-cells = <0>; @@ -76,13 +75,11 @@ PHY0: ethernet-phy@0 { interrupt-parent = <&PIC>; reg = <0>; - device_type = "ethernet-phy"; }; PHY1: ethernet-phy@1 { interrupt-parent = <&PIC>; reg = <1>; - device_type = "ethernet-phy"; }; }; }; |