diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-07 06:58:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-08 02:54:26 -0500 |
commit | a3aa18842a5303fc28fcc4d57dbd16618bd830a0 (patch) | |
tree | 9214348bd1e57ad0a3701314be60adf19dfef702 /drivers/net/wan | |
parent | 108316c1bd0a75ba855ce4a6540c530e1562bfb0 (diff) |
drivers/net/: use DEFINE_PCI_DEVICE_TABLE()
Use DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section
in every case.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/dscc4.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/farsync.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/pc300too.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/pci200syn.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/wanxl.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 3f759daf3ca4..f88c07c13197 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -2050,7 +2050,7 @@ static int __init dscc4_setup(char *str) | |||
2050 | __setup("dscc4.setup=", dscc4_setup); | 2050 | __setup("dscc4.setup=", dscc4_setup); |
2051 | #endif | 2051 | #endif |
2052 | 2052 | ||
2053 | static struct pci_device_id dscc4_pci_tbl[] = { | 2053 | static DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl) = { |
2054 | { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, | 2054 | { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, |
2055 | PCI_ANY_ID, PCI_ANY_ID, }, | 2055 | PCI_ANY_ID, PCI_ANY_ID, }, |
2056 | { 0,} | 2056 | { 0,} |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 9bc2e3649157..40d724a8e020 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -528,7 +528,7 @@ static int fst_debug_mask = { FST_DEBUG }; | |||
528 | /* | 528 | /* |
529 | * PCI ID lookup table | 529 | * PCI ID lookup table |
530 | */ | 530 | */ |
531 | static struct pci_device_id fst_pci_dev_id[] __devinitdata = { | 531 | static DEFINE_PCI_DEVICE_TABLE(fst_pci_dev_id) = { |
532 | {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, | 532 | {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, |
533 | PCI_ANY_ID, 0, 0, FST_TYPE_T2P}, | 533 | PCI_ANY_ID, 0, 0, FST_TYPE_T2P}, |
534 | 534 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 4b6f27e7c820..b27850377121 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | static int LMC_PKT_BUF_SZ = 1542; | 78 | static int LMC_PKT_BUF_SZ = 1542; |
79 | 79 | ||
80 | static struct pci_device_id lmc_pci_tbl[] = { | 80 | static DEFINE_PCI_DEVICE_TABLE(lmc_pci_tbl) = { |
81 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, | 81 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, |
82 | PCI_VENDOR_ID_LMC, PCI_ANY_ID }, | 82 | PCI_VENDOR_ID_LMC, PCI_ANY_ID }, |
83 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, | 83 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, |
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index aec4d3955420..f4f1c00d0d23 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -251,7 +251,7 @@ static char rcsid[] = | |||
251 | #undef PC300_DEBUG_RX | 251 | #undef PC300_DEBUG_RX |
252 | #undef PC300_DEBUG_OTHER | 252 | #undef PC300_DEBUG_OTHER |
253 | 253 | ||
254 | static struct pci_device_id cpc_pci_dev_id[] __devinitdata = { | 254 | static DEFINE_PCI_DEVICE_TABLE(cpc_pci_dev_id) = { |
255 | /* PC300/RSV or PC300/X21, 2 chan */ | 255 | /* PC300/RSV or PC300/X21, 2 chan */ |
256 | {0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300}, | 256 | {0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300}, |
257 | /* PC300/RSV or PC300/X21, 1 chan */ | 257 | /* PC300/RSV or PC300/X21, 1 chan */ |
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c index 60ece54bdd94..c7ab3becd261 100644 --- a/drivers/net/wan/pc300too.c +++ b/drivers/net/wan/pc300too.c | |||
@@ -481,7 +481,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, | |||
481 | 481 | ||
482 | 482 | ||
483 | 483 | ||
484 | static struct pci_device_id pc300_pci_tbl[] __devinitdata = { | 484 | static DEFINE_PCI_DEVICE_TABLE(pc300_pci_tbl) = { |
485 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID, | 485 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID, |
486 | PCI_ANY_ID, 0, 0, 0 }, | 486 | PCI_ANY_ID, 0, 0, 0 }, |
487 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID, | 487 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID, |
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c index f1340faaf022..e2cff64a446a 100644 --- a/drivers/net/wan/pci200syn.c +++ b/drivers/net/wan/pci200syn.c | |||
@@ -417,7 +417,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, | |||
417 | 417 | ||
418 | 418 | ||
419 | 419 | ||
420 | static struct pci_device_id pci200_pci_tbl[] __devinitdata = { | 420 | static DEFINE_PCI_DEVICE_TABLE(pci200_pci_tbl) = { |
421 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, | 421 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, |
422 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, | 422 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, |
423 | { 0, } | 423 | { 0, } |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index daee8a0624ee..541c700dceef 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -814,7 +814,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev, | |||
814 | return 0; | 814 | return 0; |
815 | } | 815 | } |
816 | 816 | ||
817 | static struct pci_device_id wanxl_pci_tbl[] __devinitdata = { | 817 | static DEFINE_PCI_DEVICE_TABLE(wanxl_pci_tbl) = { |
818 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID, | 818 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID, |
819 | PCI_ANY_ID, 0, 0, 0 }, | 819 | PCI_ANY_ID, 0, 0, 0 }, |
820 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID, | 820 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID, |