aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc8378_rdb.dts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-06 14:23:39 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-06 14:23:39 +0200
commit68083e05d72d94f347293d8cc0067050ba904bfa (patch)
tree842e71365bd90866be7add181661a4039d891564 /arch/powerpc/boot/dts/mpc8378_rdb.dts
parent7baac8b91f9871ba8cb09af84de4ae1d86d07812 (diff)
parentb7279469d66b55119784b8b9529c99c1955fe747 (diff)
downloadkernel_samsung_smdk4412-68083e05d72d94f347293d8cc0067050ba904bfa.tar.gz
kernel_samsung_smdk4412-68083e05d72d94f347293d8cc0067050ba904bfa.tar.bz2
kernel_samsung_smdk4412-68083e05d72d94f347293d8cc0067050ba904bfa.zip
Merge commit 'v2.6.26-rc9' into cpus4096
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 711f9a30f9a..0e872a60e09 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 {