summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/dts/mpc8378_rdb.dts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-25 12:29:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-25 12:29:02 +0200
commit37f5d732f34fa099676b2c52b8a57bab01a011de (patch)
treecca207ab2009e8d5d2097602133d1a20de2b2e5c /arch/powerpc/boot/dts/mpc8378_rdb.dts
parented9e4996d9a123b7550e63713d563f524fa9d9f0 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
Merge branch 'linus' into tracing/sysproftip-tracing-sysprof-2008-06-25_10.29_Wed
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8378_rdb.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc8378_rdb.dts8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 711f9a30f9ab..0e872a60e091 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -164,12 +164,6 @@
reg = <0x2>;
device_type = "ethernet-phy";
};
- phy3: ethernet-phy@3 {
- interrupt-parent = <&ipic>;
- interrupts = <18 0x8>;
- reg = <0x3>;
- device_type = "ethernet-phy";
- };
};
enet0: ethernet@24000 {
@@ -195,7 +189,7 @@
interrupts = <35 0x8 36 0x8 37 0x8>;
phy-connection-type = "mii";
interrupt-parent = <&ipic>;
- phy-handle = <&phy3>;
+ fixed-link = <1 1 1000 0 0>;
};
serial0: serial@4500 {