[kernel] r14585 - in dists/sid/linux-2.6/debian: . patches/bugfix/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat Nov  7 10:12:30 2009
New Revision: 14585

Log:
Fix a build failure of the ISDN hisax elsa driver on ARM.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/isdn-hisax-elsa-build-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Nov  7 09:28:49 2009	(r14584)
+++ dists/sid/linux-2.6/debian/changelog	Sat Nov  7 10:12:30 2009	(r14585)
@@ -10,6 +10,7 @@
   * Add QNAP TS-41x support.
   * [armel/orion5x, armel/kirkwood] Enable ISDN (requested by Markus
     Krebs).
+  * Fix a build failure of the ISDN hisax elsa driver on ARM.
   * mips: fix build of vmlinux.lds (Closes: #552422).
 
   [ Ben Hutchings ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/isdn-hisax-elsa-build-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/isdn-hisax-elsa-build-fix.patch	Sat Nov  7 10:12:30 2009	(r14585)
@@ -0,0 +1,86 @@
+diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
+index f181db4..1657bba 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

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	Sat Nov  7 09:28:49 2009	(r14584)
+++ dists/sid/linux-2.6/debian/patches/series/2	Sat Nov  7 10:12:30 2009	(r14585)
@@ -9,3 +9,4 @@
 - bugfix/mips/fix-build-vmlinuxlds.patch
 - bugfix/all/cpuidle-return-with-irq-enabled.patch
 + bugfix/all/stable/patch-2.6.31.6-rc1
++ bugfix/arm/isdn-hisax-elsa-build-fix.patch