Zaptel fixes for 2.6

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@402 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 8 insertions, 1 deletions

diff --git a/wcfxs.c b/wcfxs.c
index e0cbfaf..907ebcb 100755
--- a/wcfxs.c
+++ b/wcfxs.c
@@ -1901,16 +1901,23 @@ static void __devexit wcfxs_remove_one(struct pci_dev *pdev)
 	}
 }
 
-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,