diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c
index 47ad1a2..e6ff52e 100644
--- a/drivers/dahdi/pciradio.c
+++ b/drivers/dahdi/pciradio.c
@@ -1850,7 +1850,7 @@ static void __devexit pciradio_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id pciradio_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(pciradio_pci_tbl) = {
 	{ 0xe159, 0x0001, 0xe16b, PCI_ANY_ID, 0, 0, (unsigned long)"PCIRADIO" },
 	{ 0 }
 };
diff --git a/drivers/dahdi/tor2-hw.h b/drivers/dahdi/tor2-hw.h
index 04f01d5..2dceab8 100644
--- a/drivers/dahdi/tor2-hw.h
+++ b/drivers/dahdi/tor2-hw.h
@@ -108,7 +108,7 @@
 #define PCI_VENDOR_ID_PLX	0x10b5
 
 #ifdef __KERNEL__
-static struct pci_device_id tor2_pci_ids[] =
+static DEFINE_PCI_DEVICE_TABLE(tor2_pci_ids) =
 #else
 #define PCI_ANY_ID -1
 static struct tor2_pci_id {
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index 6fbf44d..087bd6e 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -3035,7 +3035,7 @@ static void __devexit b4xxp_remove(struct pci_dev *pdev)
 	return;
 }
 
-static struct pci_device_id b4xx_ids[] __devinitdata =
+static DEFINE_PCI_DEVICE_TABLE(b4xx_ids) =
 {
 	{ 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp },
 	{ 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s },
diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
index 663dea6..78d0d33 100644
--- a/drivers/dahdi/wcfxo.c
+++ b/drivers/dahdi/wcfxo.c
@@ -1029,7 +1029,7 @@ static void __devexit wcfxo_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id wcfxo_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(wcfxo_pci_tbl) = {
 	{ 0xe159, 0x0001, 0x8084, PCI_ANY_ID, 0, 0, (unsigned long) &generic },
 	{ 0xe159, 0x0001, 0x8085, PCI_ANY_ID, 0, 0, (unsigned long) &wcx101p },
 	{ 0xe159, 0x0001, 0x8086, PCI_ANY_ID, 0, 0, (unsigned long) &generic },
diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c
index 5ba9566..7173886 100644
--- a/drivers/dahdi/wct1xxp.c
+++ b/drivers/dahdi/wct1xxp.c
@@ -1397,7 +1397,7 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id t1xxp_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(t1xxp_pci_tbl) = {
 	{ 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard T100P T1/PRI or E100P E1/PRA Board" },
 	{ 0 }
 };
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index 256c0ed..eb6d04e 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -4928,7 +4928,7 @@ static void __devexit t4_remove_one(struct pci_dev *pdev)
 }
 
 
-static struct pci_device_id t4_pci_tbl[] __devinitdata =
+static DEFINE_PCI_DEVICE_TABLE(t4_pci_tbl) =
 {
 	{ 0x10ee, 0x0314, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct4xxp },
 
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index 1e2b771..c273167 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -3711,7 +3711,7 @@ static void __devexit wctc4xxp_remove_one(struct pci_dev *pdev)
 	kfree(wc);
 }
 
-static struct pci_device_id wctc4xxp_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(wctc4xxp_pci_tbl) = {
 	{ 0xd161, 0x3400, PCI_ANY_ID, PCI_ANY_ID,
 		0, 0, (unsigned long) &wctc400p }, /* Digium board */
 	{ 0xd161, 0x8004, PCI_ANY_ID, PCI_ANY_ID,
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
index 4b04f3e..c3c6d57 100644
--- a/drivers/dahdi/wctdm.c
+++ b/drivers/dahdi/wctdm.c
@@ -2744,7 +2744,7 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id wctdm_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(wctdm_pci_tbl) = {
 	{ 0xe159, 0x0001, 0xa159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm },
 	{ 0xe159, 0x0001, 0xe159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm },
 	{ 0xe159, 0x0001, 0xb100, PCI_ANY_ID, 0, 0, (unsigned long) &wctdme },
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index 90c4081..398ce78 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -5201,7 +5201,7 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id wctdm_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(wctdm_pci_tbl) = {
 	{ 0xd161, 0x2400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm2400 },
 	{ 0xd161, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm800 },
 	{ 0xd161, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wcaex800 },
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index 7d73f57..0da17aa 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -1579,7 +1579,7 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev)
 	}
 }
 
-static struct pci_device_id t1xxp_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(t1xxp_pci_tbl) = {
 	{ 0xe159, 0x0001, 0x71fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },
 	{ 0xe159, 0x0001, 0x79fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },
 	{ 0xe159, 0x0001, 0x795e, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index d2b9da4..3dd4bbc 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -2379,7 +2379,7 @@ static void __devexit te12xp_remove_one(struct pci_dev *pdev)
 	free_wc(wc);
 }
 
-static struct pci_device_id te12xp_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(te12xp_pci_tbl) = {
 	{ 0xd161, 0x0120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te120p},
 	{ 0xd161, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te121},
 	{ 0xd161, 0x8001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te122},
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index f181444..4c1452c 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1324,6 +1324,11 @@ wait_for_completion_interruptible_timeout(struct completion *x,
 #define mutex_unlock(_x) up(_x)
 #endif
 
+#ifndef DEFINE_PCI_DEVICE_TABLE
+#define DEFINE_PCI_DEVICE_TABLE(_x) \
+	const struct pci_device_id _x[] __devinitdata
+#endif
+
 #ifndef DMA_BIT_MASK
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 #endif