summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 19:24:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 19:24:43 -0800
commite1762ec6d72b71c4476018af3c153cd362a5e94e (patch)
tree6814cb9ee9dee93e5734be92cd1d6775c335ba48 /arch
parentef59c4e935feb966900a8321e75f74d7df2a2f16 (diff)
parent0cbd782507c502428c8ab3e91bee3940c19ac4d4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/powermac/feature.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 2296f3d46ca..558dd069209 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -910,18 +910,16 @@ 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);
- msleep(10);
+ mdelay(10);
LOCK(flags);
MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */
KEYLARGO_GPIO_OUTOUT_DATA);
UNLOCK(flags);
- msleep(10);
+ mdelay(10);
return 0;
}