diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
| commit | f58f8be7f65312f602f7970e7da47a6413e692b0 (patch) | |
| tree | f60cc040deebceea1b44082dc713e95687d8527f /drivers/net/tulip/21142.c | |
| parent | c71c18576d0d8aa4db876c737c3c597c724cf02f (diff) | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
| download | talos-op-linux-f58f8be7f65312f602f7970e7da47a6413e692b0.tar.gz talos-op-linux-f58f8be7f65312f602f7970e7da47a6413e692b0.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/tulip/21142.c')
| -rw-r--r-- | drivers/net/tulip/21142.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c index 5db694c4eb02..683f14b01c06 100644 --- a/drivers/net/tulip/21142.c +++ b/drivers/net/tulip/21142.c @@ -172,7 +172,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5) int i; for (i = 0; i < tp->mtable->leafcount; i++) if (tp->mtable->mleaf[i].media == dev->if_port) { - int startup = ! ((tp->chip_id == DC21143 && tp->revision == 65)); + int startup = ! ((tp->chip_id == DC21143 && (tp->revision == 48 || tp->revision == 65))); tp->cur_index = i; tulip_select_media(dev, startup); setup_done = 1; |
