Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / arch / powerpc / boot / dts / taishan.dts

diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 058438f..1657ad0 100644 (file)
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -337,7 +337,7 @@
                                rx-fifo-size = <4096>;
                                tx-fifo-size = <2048>;
                                phy-mode = "rgmii";
-                               phy-map = <0x00000001>;
+                               phy-address = <1>;
                                rgmii-device = <&RGMII0>;
                                rgmii-channel = <0>;
                                zmii-device = <&ZMII0>;
@@ -361,7 +361,7 @@
                                rx-fifo-size = <4096>;
                                tx-fifo-size = <2048>;
                                phy-mode = "rgmii";
-                               phy-map = <0x00000003>;
+                               phy-address = <3>;
                                rgmii-device = <&RGMII0>;
                                rgmii-channel = <1>;
                                zmii-device = <&ZMII0>;