diff options
-rwxr-xr-x | tor2-hw.h | 2 | ||||
-rwxr-xr-x | tor2.c | 4 | ||||
-rwxr-xr-x | wcfxo.c | 11 | ||||
-rwxr-xr-x | wcfxs.c | 9 | ||||
-rwxr-xr-x | wct1xxp.c | 9 | ||||
-rwxr-xr-x | wct4xxp.c | 4 | ||||
-rwxr-xr-x | wctdm.c | 9 |
7 files changed, 41 insertions, 7 deletions
@@ -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 { @@ -615,7 +615,11 @@ static void __devexit tor2_remove(struct pci_dev *pdev) 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, }; @@ -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, }; @@ -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, @@ -1364,14 +1364,21 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev) } } -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, @@ -1680,7 +1680,11 @@ static struct pci_device_id t4_pci_tbl[] __devinitdata = 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, @@ -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, |