diff options
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index c67c91251d04..cabdf894e21e 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1224,7 +1224,7 @@ out: | |||
1224 | * Chips that have the MRM/reserved bit quirk and the burst quirk. That | 1224 | * Chips that have the MRM/reserved bit quirk and the burst quirk. That |
1225 | * is the DM910X and the on chip ULi devices | 1225 | * is the DM910X and the on chip ULi devices |
1226 | */ | 1226 | */ |
1227 | 1227 | ||
1228 | static int tulip_uli_dm_quirk(struct pci_dev *pdev) | 1228 | static int tulip_uli_dm_quirk(struct pci_dev *pdev) |
1229 | { | 1229 | { |
1230 | if (pdev->vendor == 0x1282 && pdev->device == 0x9102) | 1230 | if (pdev->vendor == 0x1282 && pdev->device == 0x9102) |
@@ -1297,7 +1297,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1297 | */ | 1297 | */ |
1298 | 1298 | ||
1299 | /* 1. Intel Saturn. Switch to 8 long words burst, 8 long word cache | 1299 | /* 1. Intel Saturn. Switch to 8 long words burst, 8 long word cache |
1300 | aligned. Aries might need this too. The Saturn errata are not | 1300 | aligned. Aries might need this too. The Saturn errata are not |
1301 | pretty reading but thankfully it's an old 486 chipset. | 1301 | pretty reading but thankfully it's an old 486 chipset. |
1302 | 1302 | ||
1303 | 2. The dreaded SiS496 486 chipset. Same workaround as Intel | 1303 | 2. The dreaded SiS496 486 chipset. Same workaround as Intel |
@@ -1483,14 +1483,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1483 | sa_offset = 2; /* Grrr, damn Matrox boards. */ | 1483 | sa_offset = 2; /* Grrr, damn Matrox boards. */ |
1484 | multiport_cnt = 4; | 1484 | multiport_cnt = 4; |
1485 | } | 1485 | } |
1486 | #ifdef CONFIG_DDB5476 | ||
1487 | if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 6)) { | ||
1488 | /* DDB5476 MAC address in first EEPROM locations. */ | ||
1489 | sa_offset = 0; | ||
1490 | /* No media table either */ | ||
1491 | tp->flags &= ~HAS_MEDIA_TABLE; | ||
1492 | } | ||
1493 | #endif | ||
1494 | #ifdef CONFIG_DDB5477 | 1486 | #ifdef CONFIG_DDB5477 |
1495 | if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) { | 1487 | if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) { |
1496 | /* DDB5477 MAC address in first EEPROM locations. */ | 1488 | /* DDB5477 MAC address in first EEPROM locations. */ |
@@ -1500,7 +1492,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1500 | } | 1492 | } |
1501 | #endif | 1493 | #endif |
1502 | #ifdef CONFIG_MIPS_COBALT | 1494 | #ifdef CONFIG_MIPS_COBALT |
1503 | if ((pdev->bus->number == 0) && | 1495 | if ((pdev->bus->number == 0) && |
1504 | ((PCI_SLOT(pdev->devfn) == 7) || | 1496 | ((PCI_SLOT(pdev->devfn) == 7) || |
1505 | (PCI_SLOT(pdev->devfn) == 12))) { | 1497 | (PCI_SLOT(pdev->devfn) == 12))) { |
1506 | /* Cobalt MAC address in first EEPROM locations. */ | 1498 | /* Cobalt MAC address in first EEPROM locations. */ |