Merge branch 'x86/uaccess' into core/percpu
[linux-2.6] / arch / powerpc / boot / dts / mpc8349emitxgp.dts
index fa40647..c87a601 100644 (file)
@@ -83,7 +83,6 @@
                        dfsrr;
 
                        rtc@68 {
-                               device_type = "rtc";
                                compatible = "dallas,ds1339";
                                reg = <0x68>;
                                interrupts = <18 0x8>;
                                reg = <0x1c>;
                                device_type = "ethernet-phy";
                        };
+                       tbi0: tbi-phy@11 {
+                               reg = <0x11>;
+                               device_type = "tbi-phy";
+                       };
                };
 
                enet0: ethernet@24000 {
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <32 0x8 33 0x8 34 0x8>;
                        interrupt-parent = <&ipic>;
+                       tbi-handle = <&tbi0>;
                        phy-handle = <&phy1c>;
                        linux,network-index = <0>;
                };