diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
| commit | d9e34325fd62310b7b49243d02b774f3ef2452db (patch) | |
| tree | d356eab72377f2576ad356de66daec23f28529a5 /drivers/net/tulip/21142.c | |
| parent | 500f83abdc83d6bd472f3d103a9a9cd85df29a29 (diff) | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
Merge branch 'upstream-fixes'
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) | |||
| 172 | int i; | 172 | int i; |
| 173 | for (i = 0; i < tp->mtable->leafcount; i++) | 173 | for (i = 0; i < tp->mtable->leafcount; i++) |
| 174 | if (tp->mtable->mleaf[i].media == dev->if_port) { | 174 | if (tp->mtable->mleaf[i].media == dev->if_port) { |
| 175 | int startup = ! ((tp->chip_id == DC21143 && tp->revision == 65)); | 175 | int startup = ! ((tp->chip_id == DC21143 && (tp->revision == 48 || tp->revision == 65))); |
| 176 | tp->cur_index = i; | 176 | tp->cur_index = i; |
| 177 | tulip_select_media(dev, startup); | 177 | tulip_select_media(dev, startup); |
| 178 | setup_done = 1; | 178 | setup_done = 1; |