diff options
| author | Rob Herring <robh@kernel.org> | 2014-01-17 16:01:27 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-01-17 16:01:27 -0600 |
| commit | 361128fcbf30f590a05c8e8789155364f37367db (patch) | |
| tree | 7f7973599e286dfd48ea724a5b7fb4bca76b294e /arch/arm/boot/dts/orion5x.dtsi | |
| parent | e2897d7e0b0460dca91b52d55ce41c888363502d (diff) | |
| parent | 482c43419fc204b4b658fa4acb80cd502e5fcbac (diff) | |
| download | blackbird-op-linux-361128fcbf30f590a05c8e8789155364f37367db.tar.gz blackbird-op-linux-361128fcbf30f590a05c8e8789155364f37367db.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
Diffstat (limited to 'arch/arm/boot/dts/orion5x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/orion5x.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi index e06c37e91ac6..b1645462e270 100644 --- a/arch/arm/boot/dts/orion5x.dtsi +++ b/arch/arm/boot/dts/orion5x.dtsi @@ -154,7 +154,6 @@ status = "disabled"; ethernet-port@0 { - device_type = "network"; compatible = "marvell,orion-eth-port"; reg = <0>; /* overwrite MAC address in bootloader */ |
