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, 3 deletions

diff --git a/wcfxo.c b/wcfxo.c
index 4956a51..3c3e829 100755
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -972,18 +972,23 @@ static void __devexit wcfxo_remove_one(struct pci_dev *pdev)
 	}
 }
 
-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,
 };