From 35ddf0a2a98f8894affd69db17316abda45fdf22 Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Thu, 7 Jul 2011 10:37:50 +0300 Subject: [PATCH] --- yaml --- r: 259147 b: refs/heads/master c: f6ad160e6f4f4d6933eeb82a2bfa25ea008585f0 h: refs/heads/master i: 259145: 21a5db3e11b67f21518c76342db978e5b662014d 259143: b5b2984e464e084a0a839ce819b7866c23e27a99 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/dts/p1022ds.dts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89082512f1af..53377f1e1759 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2647aa19fb36326ae4d2642072e1e072d176a2fc +refs/heads/master: f6ad160e6f4f4d6933eeb82a2bfa25ea008585f0 diff --git a/trunk/arch/powerpc/boot/dts/p1022ds.dts b/trunk/arch/powerpc/boot/dts/p1022ds.dts index 98d9426d4b85..1be9743ab5e0 100644 --- a/trunk/arch/powerpc/boot/dts/p1022ds.dts +++ b/trunk/arch/powerpc/boot/dts/p1022ds.dts @@ -412,7 +412,6 @@ fsl,magic-packet; fsl,wake-on-filer; local-mac-address = [ 00 00 00 00 00 00 ]; - fixed-link = <1 1 1000 0 0>; phy-handle = <&phy0>; phy-connection-type = "rgmii-id"; queue-group@0{ @@ -439,7 +438,6 @@ fsl,num_rx_queues = <0x8>; fsl,num_tx_queues = <0x8>; local-mac-address = [ 00 00 00 00 00 00 ]; - fixed-link = <1 1 1000 0 0>; phy-handle = <&phy1>; phy-connection-type = "rgmii-id"; queue-group@0{