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

Conflicts:
	drivers/net/can/usb/ems_usb.c

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index f181db464392..1657bba7879e 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -477,62 +477,62 @@ static void
 modem_set_init(struct IsdnCardState *cs) {
         int timeout;
 
-#define RCV_DELAY 20000 
+#define RCV_DELAY 20
         modem_write_cmd(cs, MInit_1, strlen(MInit_1));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_2, strlen(MInit_2));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_3, strlen(MInit_3));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_4, strlen(MInit_4));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY );
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_5, strlen(MInit_5));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_6, strlen(MInit_6));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         modem_write_cmd(cs, MInit_7, strlen(MInit_7));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
 }
 
 static void
 modem_set_dial(struct IsdnCardState *cs, int outgoing) {
         int timeout;
-#define RCV_DELAY 20000 
+#define RCV_DELAY 20
 
         modem_write_cmd(cs, MInit_speed28800, strlen(MInit_speed28800));
         timeout = 1000;
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
         if (outgoing)
                 modem_write_cmd(cs, MInit_dialout, strlen(MInit_dialout));
         else
@@ -541,7 +541,7 @@ modem_set_dial(struct IsdnCardState *cs, int outgoing) {
         while(timeout-- && cs->hw.elsa.transcnt)
                 udelay(1000);
         debugl1(cs, "msi tout=%d", timeout);
-        udelay(RCV_DELAY);
+        mdelay(RCV_DELAY);
 }
 
 static void