diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 22:07:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 22:07:12 -0400 |
| commit | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (patch) | |
| tree | e0977d906193eadeafebc442775491b844be79d5 /drivers | |
| parent | 4c84a39c8adba6bf2f829b217e78bfd61478191a (diff) | |
| parent | 1723b4a34af85447684c9696af83929d2c1e8e6b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
[MIPS] Make timer interrupt frequency configurable from kconfig.
[MIPS] Correct HAL2 Kconfig description
[MIPS] Fix R4K cache macro names
[MIPS] Add Missing R4K Cache Macros to IP27 & IP32
[MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
[MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
[MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
[MIPS] SN: include asm/sn/types.h for nasid_t.
[MIPS] Random fixes for sb1250
[MIPS] Fix bcm1480 compile
[MIPS] Remove support for NEC DDB5476.
[MIPS] Remove support for NEC DDB5074.
[MIPS] Cleanup memory managment initialization.
[MIPS] SN: Declare bridge_pci_ops.
[MIPS] Remove unused function alloc_pci_controller.
[MIPS] IP27: Extract pci_ops into separate file.
[MIPS] IP27: Use symbolic constants instead of magic numbers.
[MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
[MIPS] IP27: Cleanup N/M mode configuration.
[MIPS] IP27: Throw away old unused hacks.
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index b3cf11d32e24..cabdf894e21e 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
| @@ -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. */ |