From d5870b0a8b976ba143558628f1c23d7973214e94 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Thu, 7 Feb 2008 00:16:32 -0800
Subject: [PATCH] --- yaml --- r: 83912 b: refs/heads/master c:
 48a67f5da1e605c0ec0534cb003ca0cd114f3d1b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/rocket.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 903168f0daba..dc85b8915217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48103c527b2fcf5ead13ef14b34eb8893eaec06a
+refs/heads/master: 48a67f5da1e605c0ec0534cb003ca0cd114f3d1b
diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c
index d83419c3857e..7a63f570e953 100644
--- a/trunk/drivers/char/rocket.c
+++ b/trunk/drivers/char/rocket.c
@@ -2191,10 +2191,10 @@ static __init int register_PCI(int i, struct pci_dev *dev)
 		num_chan = ports_per_aiop;
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		rmSpeakerReset(ctlp, rocketModel[i].model);
 	}
 	return (1);
@@ -2309,10 +2309,10 @@ static int __init init_ISA(int i)
 		total_num_chan = num_chan;
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		strcpy(rocketModel[i].modelString, "RocketModem ISA");
 	} else {
 		strcpy(rocketModel[i].modelString, "RocketPort ISA");