|
@@ -1302,17 +1302,18 @@ static const struct net_device_ops tulip_netdev_ops = {
|
|
|
#endif
|
|
|
};
|
|
|
|
|
|
+DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
|
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
|
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
|
|
|
+ { },
|
|
|
+};
|
|
|
+
|
|
|
static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|
|
const struct pci_device_id *ent)
|
|
|
{
|
|
|
struct tulip_private *tp;
|
|
|
/* See note below on the multiport cards. */
|
|
|
static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'};
|
|
|
- static struct pci_device_id early_486_chipsets[] = {
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
|
|
|
- { },
|
|
|
- };
|
|
|
static int last_irq;
|
|
|
static int multiport_cnt; /* For four-port boards w/one EEPROM */
|
|
|
int i, irq;
|
|
@@ -1682,7 +1683,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|
|
tp->full_duplex_lock = 1;
|
|
|
|
|
|
if (tulip_media_cap[tp->default_port] & MediaIsMII) {
|
|
|
- u16 media2advert[] = { 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 };
|
|
|
+ static const u16 media2advert[] = {
|
|
|
+ 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200
|
|
|
+ };
|
|
|
tp->mii_advertise = media2advert[tp->default_port - 9];
|
|
|
tp->mii_advertise |= (tp->flags & HAS_8023X); /* Matching bits! */
|
|
|
}
|