Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / board / freescale / mpc8360emds / mpc8360emds.c

diff --git a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c
index 39a86dffe1cde09c2d76906eecffc230d4ee8ce7..5ff9dff5870791aa085426f3f1ebc18c88d22bf0 100644 (file)
--- a/board/freescale/mpc8360emds/mpc8360emds.c
+++ b/board/freescale/mpc8360emds/mpc8360emds.c
@@ -11,13 +11,13 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <fsl_mdio.h>
 #if defined(CONFIG_PCI)
 #include <pci.h>
 #endif
 #include <spd_sdram.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
-#include <asm/fsl_enet.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <libfdt.h>
@@ -427,7 +427,7 @@ void ft_board_setup(void *blob, bd_t *bd)
                        if (prop) {
                                path = fdt_path_offset(blob, prop);
                                prop = fdt_getprop(blob, path,
-                                                  "phy-connection-type", 0);
+                                                  "phy-connection-type", 0);
                                if (prop && (strcmp(prop, "rgmii-id") == 0))
                                        fdt_fixup_phy_connection(blob, path,
                                                PHY_INTERFACE_MODE_RGMII_RXID);
@@ -439,7 +439,7 @@ void ft_board_setup(void *blob, bd_t *bd)
                        if (prop) {
                                path = fdt_path_offset(blob, prop);
                                prop = fdt_getprop(blob, path,
-                                                  "phy-connection-type", 0);
+                                                  "phy-connection-type", 0);
                                if (prop && (strcmp(prop, "rgmii-id") == 0))
                                        fdt_fixup_phy_connection(blob, path,
                                                PHY_INTERFACE_MODE_RGMII_RXID);