Merge branch 'linux-2.6'

[~andy/linux] / arch / powerpc / boot / dts / mpc832x_mds.dts

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 06b310698a024e95e759302c9f9a79be24ef1add..112dd5198fe2d4d4406fb5e29cf6b665eda6b1d1 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -16,7 +16,6 @@
        #size-cells = <1>;
 
        cpus {
-               #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -147,7 +146,7 @@
                        interrupt-parent = < &ipic >;
                        interrupts = <42 8>;
                        bus-range = <0 0>;
-                       ranges = <02000000 0 a0000000 90000000 0 10000000
+                       ranges = <02000000 0 90000000 90000000 0 10000000
                                  42000000 0 80000000 80000000 0 10000000
                                  01000000 0 00000000 d0000000 0 00100000>;
                        clock-frequency = <0>;
@@ -307,14 +306,12 @@
                                interrupts = <11 8>;
                                reg = <3>;
                                device_type = "ethernet-phy";
-                               interface = <3>; //ENET_100_MII
                        };
                        phy4: ethernet-phy@04 {
                                interrupt-parent = < &ipic >;
                                interrupts = <12 8>;
                                reg = <4>;
                                device_type = "ethernet-phy";
-                               interface = <3>;
                        };
                };