diff options
Diffstat (limited to 'drivers/net/ethernet/sun')
-rw-r--r-- | drivers/net/ethernet/sun/cassini.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/niu.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sungem.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index b9ac20f42651..37f87ff28f03 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c | |||
@@ -229,7 +229,7 @@ static u16 link_modes[] = { | |||
229 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ | 229 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ |
230 | }; | 230 | }; |
231 | 231 | ||
232 | static DEFINE_PCI_DEVICE_TABLE(cas_pci_tbl) = { | 232 | static const struct pci_device_id cas_pci_tbl[] = { |
233 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, | 233 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, |
234 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 234 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
235 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, | 235 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, |
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index db8ffde491b5..8216be46540f 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c | |||
@@ -59,7 +59,7 @@ static void writeq(u64 val, void __iomem *reg) | |||
59 | } | 59 | } |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | static DEFINE_PCI_DEVICE_TABLE(niu_pci_tbl) = { | 62 | static const struct pci_device_id niu_pci_tbl[] = { |
63 | {PCI_DEVICE(PCI_VENDOR_ID_SUN, 0xabcd)}, | 63 | {PCI_DEVICE(PCI_VENDOR_ID_SUN, 0xabcd)}, |
64 | {} | 64 | {} |
65 | }; | 65 | }; |
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 102a66fc54a2..f7415b6bf141 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c | |||
@@ -85,7 +85,7 @@ MODULE_LICENSE("GPL"); | |||
85 | 85 | ||
86 | #define GEM_MODULE_NAME "gem" | 86 | #define GEM_MODULE_NAME "gem" |
87 | 87 | ||
88 | static DEFINE_PCI_DEVICE_TABLE(gem_pci_tbl) = { | 88 | static const struct pci_device_id gem_pci_tbl[] = { |
89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, | 89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, |
90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
91 | 91 | ||
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 0dbf46f08ed5..72c8525d5457 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c | |||
@@ -3172,7 +3172,7 @@ static void happy_meal_pci_remove(struct pci_dev *pdev) | |||
3172 | free_netdev(net_dev); | 3172 | free_netdev(net_dev); |
3173 | } | 3173 | } |
3174 | 3174 | ||
3175 | static DEFINE_PCI_DEVICE_TABLE(happymeal_pci_ids) = { | 3175 | static const struct pci_device_id happymeal_pci_ids[] = { |
3176 | { PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) }, | 3176 | { PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) }, |
3177 | { } /* Terminating entry */ | 3177 | { } /* Terminating entry */ |
3178 | }; | 3178 | }; |