diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-16 14:30:47 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 14:30:47 +1000 |
| commit | ecab9ab22a9a64d6412961e42a5a23c74c6b6220 (patch) | |
| tree | 149534c58c1e406453eac42a5d5e6536cfc66dc5 /arch/powerpc/boot/dts/mpc8379_rdb.dts | |
| parent | 8d6bcd6e219f183aba4fb62bb7065a4db772ac49 (diff) | |
| parent | f17c63231c9c2bfc5717af1890ad17312a1c2c1c (diff) | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8379_rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_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 { |