From 9e5037e6f6ff6d71a8b8207f703e7f356dec23dc Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 3 Sep 2008 16:50:03 +0200 Subject: [PATCH] --- yaml --- r: 111835 b: refs/heads/master c: c1d69937ee5818bcde3bed8c012c9f07d60e492e h: refs/heads/master i: 111833: 72d2047bbb2c7eb83b1938a26351795668a89ba9 111831: 599605d9bf2cc30eeab55cf23c226caa59f13908 v: v3 --- [refs] | 2 +- trunk/drivers/net/r6040.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 250403ebad5f..9ebfa9b000bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31b760202a0911384fa07796df9d1905e9e89a7f +refs/heads/master: c1d69937ee5818bcde3bed8c012c9f07d60e492e diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 5d86281d9363..025f526558bc 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev) /* Reset internal state machine */ iowrite16(2, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* MAC Bus Control Register */ iowrite16(MBCR_DEFAULT, ioaddr + MBCR); @@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev) iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* Restore MAC Address */ adrp = (u16 *) dev->dev_addr;