diff --git a/[refs] b/[refs] index 5cff9ec214d0..3675cd3c70ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13ccf043ce85b64802a57bd3e47ca1505b6bf275 +refs/heads/master: f0911aaea991342ca8346dbcfec3b7575ab22cba diff --git a/trunk/drivers/atm/he.c b/trunk/drivers/atm/he.c index d6891267f5bb..507362a76a73 100644 --- a/trunk/drivers/atm/he.c +++ b/trunk/drivers/atm/he.c @@ -1055,7 +1055,7 @@ static int he_start(struct atm_dev *dev) he_writel(he_dev, 0x0, RESET_CNTL); he_writel(he_dev, 0xff, RESET_CNTL); - udelay(16*1000); /* 16 ms */ + msleep(16); /* 16 ms */ status = he_readl(he_dev, RESET_CNTL); if ((status & BOARD_RST_STATUS) == 0) { hprintk("reset failed\n");