Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 558dd0692092..2296f3d46ca8 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -910,16 +910,18 @@ core99_gmac_phy_reset(struct device_node *node, long param, long value)
             macio->type != macio_intrepid)
                 return -ENODEV;
 
+        printk(KERN_DEBUG "Hard reset of PHY chip ...\n");
+
         LOCK(flags);
         MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE);
         (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET);
         UNLOCK(flags);
-        mdelay(10);
+        msleep(10);
         LOCK(flags);
         MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */
                 KEYLARGO_GPIO_OUTOUT_DATA);
         UNLOCK(flags);
-        mdelay(10);
+        msleep(10);
 
         return 0;
 }