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/tulip | |
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/tulip')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/dmfe.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/uli526x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index d4255d44cb75..87ea39e2037d 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -337,7 +337,7 @@ static void de21041_media_timer (unsigned long data); | |||
337 | static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media); | 337 | static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media); |
338 | 338 | ||
339 | 339 | ||
340 | static struct pci_device_id de_pci_tbl[] = { | 340 | static DEFINE_PCI_DEVICE_TABLE(de_pci_tbl) = { |
341 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, | 341 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, |
342 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 342 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
343 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, | 343 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index ad63621913c3..8153fdd0af91 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -2068,7 +2068,7 @@ static void dmfe_HPNA_remote_cmd_chk(struct dmfe_board_info * db) | |||
2068 | 2068 | ||
2069 | 2069 | ||
2070 | 2070 | ||
2071 | static struct pci_device_id dmfe_pci_tbl[] = { | 2071 | static DEFINE_PCI_DEVICE_TABLE(dmfe_pci_tbl) = { |
2072 | { 0x1282, 0x9132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9132_ID }, | 2072 | { 0x1282, 0x9132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9132_ID }, |
2073 | { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9102_ID }, | 2073 | { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9102_ID }, |
2074 | { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9100_ID }, | 2074 | { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9100_ID }, |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 0fa3140d65bf..64aa2d6af08b 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -207,7 +207,7 @@ struct tulip_chip_table tulip_tbl[] = { | |||
207 | }; | 207 | }; |
208 | 208 | ||
209 | 209 | ||
210 | static struct pci_device_id tulip_pci_tbl[] = { | 210 | static DEFINE_PCI_DEVICE_TABLE(tulip_pci_tbl) = { |
211 | { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 }, | 211 | { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 }, |
212 | { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 }, | 212 | { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 }, |
213 | { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 }, | 213 | { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 }, |
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index fa019cabc355..d549042a01df 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -1783,7 +1783,7 @@ static u16 phy_read_1bit(unsigned long ioaddr, u32 chip_id) | |||
1783 | } | 1783 | } |
1784 | 1784 | ||
1785 | 1785 | ||
1786 | static struct pci_device_id uli526x_pci_tbl[] = { | 1786 | static DEFINE_PCI_DEVICE_TABLE(uli526x_pci_tbl) = { |
1787 | { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID }, | 1787 | { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID }, |
1788 | { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID }, | 1788 | { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID }, |
1789 | { 0, } | 1789 | { 0, } |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 869a7a0005f9..23395e1ff238 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -218,7 +218,7 @@ enum chip_capability_flags { | |||
218 | CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8, | 218 | CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8, |
219 | }; | 219 | }; |
220 | 220 | ||
221 | static const struct pci_device_id w840_pci_tbl[] = { | 221 | static DEFINE_PCI_DEVICE_TABLE(w840_pci_tbl) = { |
222 | { 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 }, | 222 | { 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 }, |
223 | { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, | 223 | { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, |
224 | { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, | 224 | { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, |
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 9924c4c7e2d6..c84123fd635c 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -144,7 +144,7 @@ static int link_status(struct xircom_private *card); | |||
144 | 144 | ||
145 | 145 | ||
146 | 146 | ||
147 | static struct pci_device_id xircom_pci_table[] = { | 147 | static DEFINE_PCI_DEVICE_TABLE(xircom_pci_table) = { |
148 | {0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID,}, | 148 | {0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID,}, |
149 | {0,}, | 149 | {0,}, |
150 | }; | 150 | }; |