Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / drivers / net / ethernet / freescale / ucc_geth.c

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 650f7888e32be90f805d10b44e9f8c913c357376..5bf1ade2831577741004cf2a1ef3c3ab423c6c55 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -40,10 +40,10 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/immap_qe.h>
-#include <asm/qe.h>
-#include <asm/ucc.h>
-#include <asm/ucc_fast.h>
+#include <soc/fsl/qe/immap_qe.h>
+#include <soc/fsl/qe/qe.h>
+#include <soc/fsl/qe/ucc.h>
+#include <soc/fsl/qe/ucc_fast.h>
 #include <asm/machdep.h>
 
 #include "ucc_geth.h"
@@ -1385,7 +1385,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
                value &= ~0x1000;       /* Turn off autonegotiation */
                phy_write(tbiphy, ENET_TBI_MII_CR, value);
 
-               put_device(&tbiphy->dev);
+               put_device(&tbiphy->mdio.dev);
        }
 
        init_check_frame_length_mode(ug_info->lengthCheckRx, &ug_regs->maccfg2);
@@ -1705,7 +1705,7 @@ static void uec_configure_serdes(struct net_device *dev)
         * several seconds for it to come back.
         */
        if (phy_read(tbiphy, ENET_TBI_MII_SR) & TBISR_LSTATUS) {
-               put_device(&tbiphy->dev);
+               put_device(&tbiphy->mdio.dev);
                return;
        }
 
@@ -1716,7 +1716,7 @@ static void uec_configure_serdes(struct net_device *dev)
 
        phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS);
 
-       put_device(&tbiphy->dev);
+       put_device(&tbiphy->mdio.dev);
 }
 
 /* Configure the PHY for dev.