diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:20:33 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:20:33 -0400 |
commit | d0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (patch) | |
tree | 62615ed8bc6ab68f42b59d412a7fd7ac77c79803 /drivers/net/tulip/tulip.h | |
parent | 6f1062330499cee10396bf3fc66a03eb228c5fad (diff) | |
parent | 586a4ac509b041df55f26c2b26cd7cbdaf9b045d (diff) |
/spare/repo/libata-dev branch 'iomap-try3'
Diffstat (limited to 'drivers/net/tulip/tulip.h')
-rw-r--r-- | drivers/net/tulip/tulip.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h index 20346d847d9e..05d2d96f7be2 100644 --- a/drivers/net/tulip/tulip.h +++ b/drivers/net/tulip/tulip.h | |||
@@ -88,7 +88,6 @@ enum chips { | |||
88 | I21145, | 88 | I21145, |
89 | DM910X, | 89 | DM910X, |
90 | CONEXANT, | 90 | CONEXANT, |
91 | ULI526X | ||
92 | }; | 91 | }; |
93 | 92 | ||
94 | 93 | ||
@@ -482,11 +481,8 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp) | |||
482 | 481 | ||
483 | static inline void tulip_restart_rxtx(struct tulip_private *tp) | 482 | static inline void tulip_restart_rxtx(struct tulip_private *tp) |
484 | { | 483 | { |
485 | if(!(tp->chip_id == ULI526X && | 484 | tulip_stop_rxtx(tp); |
486 | (tp->revision == 0x40 || tp->revision == 0x50))) { | 485 | udelay(5); |
487 | tulip_stop_rxtx(tp); | ||
488 | udelay(5); | ||
489 | } | ||
490 | tulip_start_rxtx(tp); | 486 | tulip_start_rxtx(tp); |
491 | } | 487 | } |
492 | 488 | ||