Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / 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 9bb408371bcd555fd46e4fc0aeb16fc3561db27b..539e02fb35266e12d21bf1327b3e8675ca0d3dfe 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -255,9 +255,7 @@
                enet0: ucc@2200 {
                        device_type = "network";
                        compatible = "ucc_geth";
-                       model = "UCC";
                        cell-index = <3>;
-                       device-id = <3>;
                        reg = <0x2200 0x200>;
                        interrupts = <34>;
                        interrupt-parent = <&qeic>;
@@ -271,9 +269,7 @@
                enet1: ucc@3200 {
                        device_type = "network";
                        compatible = "ucc_geth";
-                       model = "UCC";
                        cell-index = <4>;
-                       device-id = <4>;
                        reg = <0x3200 0x200>;
                        interrupts = <35>;
                        interrupt-parent = <&qeic>;
@@ -287,8 +283,7 @@
                ucc@2400 {
                        device_type = "serial";
                        compatible = "ucc_uart";
-                       model = "UCC";
-                       device-id = <5>;        /* The UCC number, 1-7*/
+                       cell-index = <5>;       /* The UCC number, 1-7*/
                        port-number = <0>;      /* Which ttyQEx device */
                        soft-uart;              /* We need Soft-UART */
                        reg = <0x2400 0x200>;