diff options
| author | imp <imp@FreeBSD.org> | 2005-02-09 06:03:36 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-02-09 06:03:36 +0000 |
| commit | 6bf0e6ba56c1c226689a178af57bce25ff51c047 (patch) | |
| tree | 094ec78834886b114469663d73d9b183dae09510 /sys | |
| parent | acdf8b94283936cf29137fc7c6510b2307763c62 (diff) | |
| download | FreeBSD-src-6bf0e6ba56c1c226689a178af57bce25ff51c047.zip FreeBSD-src-6bf0e6ba56c1c226689a178af57bce25ff51c047.tar.gz | |
o Remove duplicate LINKSYS ETHERFAST entry.
o The COMBO_ECARD comes in many flavors, it seems, so probe both the DL10019
and the AX88x90 on it. Since this seems to work with no ill effects, maybe
the probing should happen more generally rather than being table driven.
Need to think more about this.
o Remove PCM100 because it is duplicative (the ETHERFAST is the pcm100 and
apparently has the same IDs). It was here for NetBSD because they match
up an expected MAC address OID, but since we don't bother with that, we
don't need to be so finely discriminating.
o Minor style nit.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index ad548e2..f67c6e4 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -128,16 +128,15 @@ static const struct ed_product { { PCMCIA_CARD(IODATA3, PCLAT, 0), 0}, { PCMCIA_CARD(KINGSTON, KNE2, 0), 0}, { PCMCIA_CARD(LANTECH, FASTNETTX, 0),NE2000DVF_AX88190 }, - { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0), NE2000DVF_DL10019 }, + { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0), + NE2000DVF_DL10019 | NE2000DVF_AX88190 }, { PCMCIA_CARD(LINKSYS, ECARD_1, 0), 0}, { PCMCIA_CARD(LINKSYS, ECARD_2, 0), 0}, { PCMCIA_CARD(LINKSYS, ETHERFAST, 0), NE2000DVF_DL10019 }, - { PCMCIA_CARD(LINKSYS, PCM100, 0), 0}, { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD, 0), 0}, - { PCMCIA_CARD(LINKSYS, ETHERFAST, 0), NE2000DVF_DL10019 }, { PCMCIA_CARD(MACNICA, ME1_JEIDA, 0), 0}, { PCMCIA_CARD(MAGICRAM, ETHER, 0), 0}, - { PCMCIA_CARD(MELCO, LPC3_CLX, 0), NE2000DVF_AX88190}, + { PCMCIA_CARD(MELCO, LPC3_CLX, 0), NE2000DVF_AX88190 }, { PCMCIA_CARD(MELCO, LPC3_TX, 0), NE2000DVF_AX88190 }, { PCMCIA_CARD(NDC, ND5100_E, 0), 0}, { PCMCIA_CARD(NETGEAR, FA410TXC, 0), NE2000DVF_DL10019}, |
