[LV-kern-commit] CVS: kernel-2.4/drivers/isdn/hisax Makefile,1.2,1.3 amd7930.c,1.2,1.3 arcofi.c,1.2,1.3 arcofi.h,1.2,1.3 asuscom.c,1.2,1.3 avm_a1.c,1.2,1.3 avm_a1p.c,1.2,1.3 avm_pci.c,1.2,1.3 bkm_a4t.c,1.2,1.3 bkm_a8.c,1.2,1.3 bkm_ax.h,1.2,1.3 callc.c,1.2,1.3 cert.c,1.2,1.3 config.c,1.2,1.3 diva.c,1.2,1.3 elsa.c,1.2,1.3 elsa_cs.c,1.1,1.2 elsa_ser.c,1.2,1.3 fsm.c,1.2,1.3 fsm.h,1.1,1.2 gazel.c,1.2,1.3 hfc_2bds0.c,1.2,1.3 hfc_2bds0.h,1.2,1.3 hfc_2bs0.c,1.2,1.3 hfc_2bs0.h,1.2,1.3 hfc_pci.c,1.2,1.3 hfc_pci.h,1.2,1.3 hfc_sx.c,1.2,1.3 hfc_sx.h,1.2,1.3 hfcscard.c,1.2,1.3 hisax.h,1.2,1.3 hscx.c,1.2,1.3 hscx.h,1.2,1.3 hscx_irq.c,1.2,1.3 icc.c,1.2,1.3 icc.h,1.2,1.3 ipac.h,1.2,1.3 isac.c,1.2,1.3 isac.h,1.2,1.3 isar.c,1.2,1.3 isar.h,1.2,1.3 isdnl1.c,1.2,1.3 isdnl1.h,1.2,1.3 isdnl2.c,1.2,1.3 isdnl2.h,1.2,1.3 isdnl3.c,1.2,1.3 isdnl3.h,1.2,1.3 isurf.c,1.2,1.3 ix1_micro.c,1.2,1.3 jade.c,1.2,1.3 jade.h,1.2,1.3 jade_irq.c,1.2,1.3 l3_1tr6.c,1.2,1.3 l3_1tr6.h,1.2,1.3 l3dss1.c,1.2,1.3 l3dss1.h,1.2,1.3 l3ni1.c,1.2,1.3 l3ni1.h,1.2,1.3 lmgr.c,1.2,1.3 mic.c,1.2,1.3 netjet.c,1.2,1.3 netjet.h,1.2,1.3 niccy.c,1.2,1.3 nj_s.c,1.2,1.3 nj_u.c,1.2,1.3 q931.c,1.2,1.3 rawhdlc.c,1.2,1.3 rawhdlc.h,1.2,1.3 s0box.c,1.2,1.3 saphir.c,1.2,1.3 sedlbauer.c,1.2,1.3 sportster.c,1.2,1.3 st5481_b.c,1.1,1.2 st5481_d.c,1.1,1.2 st5481_init.c,1.1,1.2 st5481_usb.c,1.1,1.2 tei.c,1.2,1.3 teleint.c,1.2,1.3 teles0.c,1.2,1.3 teles3.c,1.2,1.3 telespci.c,1.2,1.3 w6692.c,1.2,1.3 w6692.h,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/isdn/hisax

Modified Files:
	Makefile amd7930.c arcofi.c arcofi.h asuscom.c avm_a1.c 
	avm_a1p.c avm_pci.c bkm_a4t.c bkm_a8.c bkm_ax.h callc.c cert.c 
	config.c diva.c elsa.c elsa_cs.c elsa_ser.c fsm.c fsm.h 
	gazel.c hfc_2bds0.c hfc_2bds0.h hfc_2bs0.c hfc_2bs0.h 
	hfc_pci.c hfc_pci.h hfc_sx.c hfc_sx.h hfcscard.c hisax.h 
	hscx.c hscx.h hscx_irq.c icc.c icc.h ipac.h isac.c isac.h 
	isar.c isar.h isdnl1.c isdnl1.h isdnl2.c isdnl2.h isdnl3.c 
	isdnl3.h isurf.c ix1_micro.c jade.c jade.h jade_irq.c 
	l3_1tr6.c l3_1tr6.h l3dss1.c l3dss1.h l3ni1.c l3ni1.h lmgr.c 
	mic.c netjet.c netjet.h niccy.c nj_s.c nj_u.c q931.c rawhdlc.c 
	rawhdlc.h s0box.c saphir.c sedlbauer.c sportster.c st5481_b.c 
	st5481_d.c st5481_init.c st5481_usb.c tei.c teleint.c teles0.c 
	teles3.c telespci.c w6692.c w6692.h 
Log Message:
DA: sync with Marcelo 2.4.17


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	10 Apr 2002 15:32:24 -0000	1.2
+++ Makefile	10 Jun 2003 01:13:36 -0000	1.3
@@ -4,9 +4,13 @@
 
 O_TARGET	  := vmlinux-obj.o
 
+# Define maximum number of cards
+
+EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
+
 # Objects that export symbols.
 
-export-objs	  := config.o fsm.o
+export-objs	  := config.o fsm.o hisax_isac.o
 
 # Multipart objects.
 
@@ -58,6 +62,7 @@
 obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o
 obj-$(CONFIG_HISAX_ELSA_CS)		+= elsa_cs.o
 obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
+obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
 
 CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
 CFLAGS_cert.o := -DCERTIFICATION=$(CERT)

Index: amd7930.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/amd7930.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: arcofi.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/arcofi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: arcofi.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/arcofi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: asuscom.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/asuscom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: avm_a1.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/avm_a1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: avm_a1p.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/avm_a1p.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: avm_pci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/avm_pci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: bkm_a4t.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/bkm_a4t.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: bkm_a8.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/bkm_a8.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: bkm_ax.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/bkm_ax.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: callc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/callc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: cert.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/cert.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: config.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.c	10 Apr 2002 15:32:24 -0000	1.2
+++ config.c	10 Jun 2003 01:13:37 -0000	1.3
@@ -336,27 +336,19 @@
 	NULL, \
 }
 
-#define EMPTY_CARD	{0, DEFAULT_PROTO, {0, 0, 0, 0}, NULL}
-
-struct IsdnCard cards[] = {
+struct IsdnCard cards[HISAX_MAX_CARDS] = {
 	FIRST_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
-	EMPTY_CARD,
 };
 
-static char HiSaxID[64] __devinitdata = { 0, };
+#define HISAX_IDSIZE (HISAX_MAX_CARDS*8)
+static char HiSaxID[HISAX_IDSIZE] __devinitdata = { 0, };
 
 char *HiSax_id __devinitdata = HiSaxID;
 #ifdef MODULE
 /* Variables for insmod */
-static int type[8] __devinitdata = { 0, };
-static int protocol[8] __devinitdata = { 0, };
-static int io[8] __devinitdata = { 0, };
+static int type[HISAX_MAX_CARDS] __devinitdata = { 0, };
+static int protocol[HISAX_MAX_CARDS] __devinitdata = { 0, };
+static int io[HISAX_MAX_CARDS] __devinitdata = { 0, };
 #undef IO0_IO1
 #ifdef CONFIG_HISAX_16_3
 #define IO0_IO1
@@ -366,25 +358,27 @@
 #define IO0_IO1
 #endif
 #ifdef IO0_IO1
-static int io0[8] __devinitdata = { 0, };
-static int io1[8] __devinitdata = { 0, };
+static int io0[HISAX_MAX_CARDS] __devinitdata = { 0, };
+static int io1[HISAX_MAX_CARDS] __devinitdata = { 0, };
 #endif
-static int irq[8] __devinitdata = { 0, };
-static int mem[8] __devinitdata = { 0, };
+static int irq[HISAX_MAX_CARDS] __devinitdata = { 0, };
+static int mem[HISAX_MAX_CARDS] __devinitdata = { 0, };
 static char *id __devinitdata = HiSaxID;
 
+#define PARM_PARA "1-" __MODULE_STRING(HISAX_MAX_CARDS) "i"
+
 MODULE_DESCRIPTION("ISDN4Linux: Driver for passive ISDN cards");
 MODULE_AUTHOR("Karsten Keil");
 MODULE_LICENSE("GPL");
-MODULE_PARM(type, "1-8i");
-MODULE_PARM(protocol, "1-8i");
-MODULE_PARM(io, "1-8i");
-MODULE_PARM(irq, "1-8i");
-MODULE_PARM(mem, "1-8i");
+MODULE_PARM(type, PARM_PARA);
+MODULE_PARM(protocol, PARM_PARA);
+MODULE_PARM(io, PARM_PARA);
+MODULE_PARM(irq, PARM_PARA);
+MODULE_PARM(mem, PARM_PARA);
 MODULE_PARM(id, "s");
 #ifdef IO0_IO1
-MODULE_PARM(io0, "1-8i");
-MODULE_PARM(io1, "1-8i");
+MODULE_PARM(io0, PARM_PARA);
+MODULE_PARM(io1, PARM_PARA);
 #endif
 #endif /* MODULE */
 
@@ -448,6 +442,7 @@
 	i = 0;
 	j = 1;
 	while (argc && (i < HISAX_MAX_CARDS)) {
+		cards[i].protocol = DEFAULT_PROTO;
 		if (argc) {
 			cards[i].typ = ints[j];
 			j++;
@@ -475,13 +470,15 @@
 		}
 		i++;
 	}
-	if (str && *str) {
-		strcpy(HiSaxID, str);
-		HiSax_id = HiSaxID;
-	} else {
+  	if (str && *str) {
+		if (strlen(str) < HISAX_IDSIZE)
+			strcpy(HiSaxID, str);
+		else
+			printk(KERN_WARNING "HiSax: ID too long!");
+	} else
 		strcpy(HiSaxID, "HiSax");
-		HiSax_id = HiSaxID;
-	}
+
+	HiSax_id = HiSaxID;
 	return 1;
 }
 
@@ -1396,6 +1393,8 @@
 		if (protocol[i]) {
 			cards[j].protocol = protocol[i];
 			nzproto++;
+		} else {
+			cards[j].protocol = DEFAULT_PROTO;
 		}
 		switch (type[i]) {
 		case ISDN_CTYPE_16_0:
@@ -1473,15 +1472,22 @@
 			} else {
 				/* QUADRO is a 4 BRI card */
 				cards[j++].para[0] = 1;
-				cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
-				cards[j].protocol = protocol[i];
-				cards[j++].para[0] = 2;
-				cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
-				cards[j].protocol = protocol[i];
-				cards[j++].para[0] = 3;
-				cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
-				cards[j].protocol = protocol[i];
-				cards[j].para[0] = 4;
+				/* we need to check if further cards can be added */
+				if (j < HISAX_MAX_CARDS) {
+					cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
+					cards[j].protocol = protocol[i];
+					cards[j++].para[0] = 2;
+				}
+				if (j < HISAX_MAX_CARDS) {
+					cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
+					cards[j].protocol = protocol[i];
+					cards[j++].para[0] = 3;
+				}
+				if (j < HISAX_MAX_CARDS) {
+					cards[j].typ = ISDN_CTYPE_SCT_QUADRO;
+					cards[j].protocol = protocol[i];
+					cards[j].para[0] = 4;
+				}
 			}
 			break;
 		}
@@ -1505,15 +1511,9 @@
 	       nrcards, (nrcards > 1) ? "s" : "");
 
 	/* Install only, if at least one card found */
-	if (!HiSax_inithardware(NULL)) {
-		retval = -EIO;
-		goto out_isdnl1;
-	}
-
+	HiSax_inithardware(NULL);
 	return 0;
 
- out_isdnl1:
-	Isdnl1Free();
  out_tei:
 	TeiFree();
  out_isdnl2:
@@ -1560,6 +1560,8 @@
 		cards[i].typ = type[i];
 		if (protocol[i]) {
 			cards[i].protocol = protocol[i];
+		} else {
+			cards[i].protocol = DEFAULT_PROTO;
 		}
 	}
 	cards[0].para[0] = pcm_irq;
@@ -1600,6 +1602,8 @@
 		cards[i].typ = type[i];
 		if (protocol[i]) {
 			cards[i].protocol = protocol[i];
+		} else {
+			cards[i].protocol = DEFAULT_PROTO;
 		}
 	}
 	cards[0].para[0] = pcm_irq;
@@ -1640,6 +1644,8 @@
 		cards[i].typ = type[i];
 		if (protocol[i]) {
 			cards[i].protocol = protocol[i];
+		} else {
+			cards[i].protocol = DEFAULT_PROTO;
 		}
 	}
 	cards[0].para[0] = pcm_irq;
@@ -1680,6 +1686,8 @@
 		cards[i].typ = type[i];
 		if (protocol[i]) {
 			cards[i].protocol = protocol[i];
+		} else {
+			cards[i].protocol = DEFAULT_PROTO;
 		}
 	}
 	cards[0].para[0] = pcm_irq;

Index: diva.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/diva.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: elsa.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/elsa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: elsa_cs.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/elsa_cs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

Index: elsa_ser.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/elsa_ser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: fsm.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/fsm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: fsm.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/fsm.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

Index: gazel.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/gazel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_2bds0.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_2bds0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_2bds0.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_2bds0.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_2bs0.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_2bs0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_2bs0.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_2bs0.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_pci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_pci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_pci.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_pci.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_sx.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_sx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfc_sx.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfc_sx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hfcscard.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hfcscard.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hisax.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hisax.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hisax.h	10 Apr 2002 15:32:24 -0000	1.2
+++ hisax.h	10 Jun 2003 01:13:38 -0000	1.3
@@ -950,8 +950,6 @@
 #define  MON0_TX	4
 #define  MON1_TX	8
 
-#define	 HISAX_MAX_CARDS	8
-
 #define  ISDN_CTYPE_16_0	1
 #define  ISDN_CTYPE_8_0		2
 #define  ISDN_CTYPE_16_3	3

Index: hscx.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hscx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hscx.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hscx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: hscx_irq.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/hscx_irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: icc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/icc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: icc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/icc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: ipac.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/ipac.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isac.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isac.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isac.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isac.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isar.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isar.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl1.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl1.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl2.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl2.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl3.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdnl3.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isdnl3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isurf.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/isurf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: ix1_micro.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/ix1_micro.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: jade.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/jade.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: jade.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/jade.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: jade_irq.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/jade_irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3_1tr6.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3_1tr6.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3_1tr6.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3_1tr6.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3dss1.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3dss1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3dss1.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3dss1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3ni1.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3ni1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: l3ni1.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/l3ni1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: lmgr.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/lmgr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: mic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/mic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: netjet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/netjet.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: netjet.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/netjet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: niccy.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/niccy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: nj_s.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/nj_s.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: nj_u.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/nj_u.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: q931.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/q931.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: rawhdlc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/rawhdlc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: rawhdlc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/rawhdlc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: s0box.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/s0box.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: saphir.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/saphir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: sedlbauer.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/sedlbauer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: sportster.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/sportster.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: st5481_b.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/st5481_b.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- st5481_b.c	10 Apr 2002 15:32:25 -0000	1.1
+++ st5481_b.c	10 Jun 2003 01:13:39 -0000	1.2
@@ -275,7 +275,7 @@
 				      usb_b_out_complete, bcs);
 }
 
-static void __devexit st5481_release_b_out(struct st5481_bcs *bcs)
+static void st5481_release_b_out(struct st5481_bcs *bcs)
 {
 	struct st5481_b_out *b_out = &bcs->b_out;
 
@@ -316,7 +316,7 @@
 /*
  * Release buffers and URBs for the B channels
  */
-void __devexit st5481_release_b(struct st5481_bcs *bcs)
+void st5481_release_b(struct st5481_bcs *bcs)
 {
 	DBG(4,"");
 

Index: st5481_d.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/st5481_d.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- st5481_d.c	10 Apr 2002 15:32:25 -0000	1.1
+++ st5481_d.c	10 Jun 2003 01:13:39 -0000	1.2
@@ -673,7 +673,7 @@
 				      usb_d_out_complete, adapter);
 }
 
-static void __devexit st5481_release_d_out(struct st5481_adapter *adapter)
+static void st5481_release_d_out(struct st5481_adapter *adapter)
 {
 	struct st5481_d_out *d_out = &adapter->d_out;
 
@@ -723,7 +723,7 @@
 	return retval;
 }
 
-void __devexit st5481_release_d(struct st5481_adapter *adapter)
+void st5481_release_d(struct st5481_adapter *adapter)
 {
 	DBG(2,"");
 

Index: st5481_init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/st5481_init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- st5481_init.c	10 Apr 2002 15:32:25 -0000	1.1
+++ st5481_init.c	10 Jun 2003 01:13:39 -0000	1.2
@@ -178,7 +178,7 @@
 static struct usb_driver st5481_usb_driver = {
 	name: "st5481_usb",
 	probe: probe_st5481,
-	disconnect: disconnect_st5481,
+	disconnect: __devexit_p(disconnect_st5481),
 	id_table: st5481_ids,
 };
 

Index: st5481_usb.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/st5481_usb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- st5481_usb.c	10 Apr 2002 15:32:25 -0000	1.1
+++ st5481_usb.c	10 Jun 2003 01:13:39 -0000	1.2
@@ -307,7 +307,7 @@
  * Release buffers and URBs for the interrupt and control
  * endpoint.
  */
-void __devexit st5481_release_usb(struct st5481_adapter *adapter)
+void st5481_release_usb(struct st5481_adapter *adapter)
 {
 	struct st5481_intr *intr = &adapter->intr;
 	struct st5481_ctrl *ctrl = &adapter->ctrl;
@@ -443,7 +443,7 @@
 	return retval;
 }
 
-void __devexit st5481_release_isocpipes(struct urb* urb[2])
+void st5481_release_isocpipes(struct urb* urb[2])
 {
 	int j;
 
@@ -547,7 +547,7 @@
 	return retval;
 }
 
-void __devexit st5481_release_in(struct st5481_in *in)
+void st5481_release_in(struct st5481_in *in)
 {
 	DBG(2,"");
 

Index: tei.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/tei.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: teleint.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/teleint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: teles0.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/teles0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: teles3.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/teles3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: telespci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/telespci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: w6692.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/w6692.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: w6692.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/hisax/w6692.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3