[Asterisk-cvs] zaptel tor2-hw.h,1.3,1.4 tor2.c,1.18,1.19 wcfxo.c,1.23,1.24 wcfxs.c,1.65,1.66 wct1xxp.c,1.17,1.18 wct4xxp.c,1.45,1.46

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv27106

Modified Files:
	tor2-hw.h tor2.c wcfxo.c wcfxs.c wct1xxp.c wct4xxp.c 
Log Message:
Zaptel fixes for 2.6


Index: tor2-hw.h
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2-hw.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tor2-hw.h	10 Oct 2002 17:07:53 -0000	1.3
+++ tor2-hw.h	26 May 2004 15:45:31 -0000	1.4
@@ -109,7 +109,7 @@
 #define PCI_VENDOR_ID_PLX	0x10b5
 
 #ifdef __KERNEL__
-static struct pci_device_id tor2_pci_ids[] __devinitdata =
+static struct pci_device_id tor2_pci_ids[] =
 #else
 #define PCI_ANY_ID -1
 static struct tor2_pci_id {

Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tor2.c	16 Apr 2004 17:59:07 -0000	1.18
+++ tor2.c	26 May 2004 15:45:31 -0000	1.19
@@ -615,7 +615,11 @@
 static struct pci_driver tor2_driver = {
 	name: "tormenta2",
 	probe: tor2_probe,
+#ifdef LINUX26
+	remove: __devexit_p(tor2_remove),
+#else
 	remove: tor2_remove,
+#endif
 	id_table: tor2_pci_ids,
 };
 

Index: wcfxo.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- wcfxo.c	31 Jan 2004 22:25:10 -0000	1.23
+++ wcfxo.c	26 May 2004 15:45:31 -0000	1.24
@@ -972,18 +972,23 @@
 	}
 }
 
-static struct pci_device_id wcfxo_pci_tbl[] __devinitdata = {
+static struct pci_device_id wcfxo_pci_tbl[] = {
 	{ 0xe159, 0x0001, 0x8085, PCI_ANY_ID, 0, 0, (unsigned long) &wcx101p },
 	{ 0xe159, 0x0001, 0x8086, PCI_ANY_ID, 0, 0, (unsigned long) &generic },
 	{ 0x1057, 0x5608, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wcx100p },
+	{ 0 }
 };
 
+MODULE_DEVICE_TABLE (pci, wcfxo_pci_tbl);
+
 static struct pci_driver wcfxo_driver = {
 	name: 	"wcfxo",
 	probe: 	wcfxo_init_one,
+#ifdef LINUX26
+	remove:	__devexit_p(wcfxo_remove_one),
+#else
 	remove:	wcfxo_remove_one,
-	suspend: NULL,
-	resume:	NULL,
+#endif
 	id_table: wcfxo_pci_tbl,
 };
 

Index: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxs.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- wcfxs.c	25 May 2004 18:06:57 -0000	1.65
+++ wcfxs.c	26 May 2004 15:45:31 -0000	1.66
@@ -1901,16 +1901,23 @@
 	}
 }
 
-static struct pci_device_id wcfxs_pci_tbl[] __devinitdata = {
+static struct pci_device_id wcfxs_pci_tbl[] = {
 	{ 0xe159, 0x0001, 0xa159, PCI_ANY_ID, 0, 0, (unsigned long) &wcfxs },
 	{ 0xe159, 0x0001, 0xe159, PCI_ANY_ID, 0, 0, (unsigned long) &wcfxs },
 	{ 0xe159, 0x0001, 0xb100, PCI_ANY_ID, 0, 0, (unsigned long) &wcfxse },
+	{ 0 }
 };
 
+MODULE_DEVICE_TABLE(pci, wcfxs_pci_tbl);
+
 static struct pci_driver wcfxs_driver = {
 	name: 	"wcfxs",
 	probe: 	wcfxs_init_one,
+#ifdef LINUX26
+	remove:	__devexit_p(wcfxs_remove_one),
+#else
 	remove:	wcfxs_remove_one,
+#endif
 	suspend: NULL,
 	resume:	NULL,
 	id_table: wcfxs_pci_tbl,

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- wct1xxp.c	16 Apr 2004 17:59:07 -0000	1.17
+++ wct1xxp.c	26 May 2004 15:45:31 -0000	1.18
@@ -1364,14 +1364,21 @@
 	}
 }
 
-static struct pci_device_id t1xxp_pci_tbl[] __devinitdata = {
+static struct pci_device_id t1xxp_pci_tbl[] = {
 	{ 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard T100P T1/PRI or E100P E1/PRA Board" },
+	{ 0 }
 };
 
+MODULE_DEVICE_TABLE(pci,t1xxp_pci_tbl);
+
 static struct pci_driver t1xxp_driver = {
 	name: 	"t1xxp",
 	probe: 	t1xxp_init_one,
+#ifdef LINUX26
+	remove:	__devexit_p(t1xxp_remove_one),
+#else
 	remove:	t1xxp_remove_one,
+#endif
 	suspend: NULL,
 	resume:	NULL,
 	id_table: t1xxp_pci_tbl,

Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- wct4xxp.c	4 May 2004 03:20:08 -0000	1.45
+++ wct4xxp.c	26 May 2004 15:45:31 -0000	1.46
@@ -1680,7 +1680,11 @@
 static struct pci_driver t4_driver = {
 	name: 	"t4xxp",
 	probe: 	t4_init_one,
+#ifdef LINUX26
+	remove:	__devexit_p(t4_remove_one),
+#else
 	remove:	t4_remove_one,
+#endif
 	suspend: NULL,
 	resume:	NULL,
 	id_table: t4_pci_tbl,