summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/tulip.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-05 05:20:33 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 05:20:33 -0400
commitd0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (patch)
tree62615ed8bc6ab68f42b59d412a7fd7ac77c79803 /drivers/net/tulip/tulip.h
parent6f1062330499cee10396bf3fc66a03eb228c5fad (diff)
parent586a4ac509b041df55f26c2b26cd7cbdaf9b045d (diff)
downloadblackbird-op-linux-d0bd99299bf933ae006d2dc6a31ffcba482ae3f2.tar.gz
blackbird-op-linux-d0bd99299bf933ae006d2dc6a31ffcba482ae3f2.zip
/spare/repo/libata-dev branch 'iomap-try3'
Diffstat (limited to 'drivers/net/tulip/tulip.h')
-rw-r--r--drivers/net/tulip/tulip.h8
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 {
I21145,
DM910X,
CONEXANT,
- ULI526X
};
@@ -482,11 +481,8 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp)
static inline void tulip_restart_rxtx(struct tulip_private *tp)
{
- if(!(tp->chip_id == ULI526X &&
- (tp->revision == 0x40 || tp->revision == 0x50))) {
- tulip_stop_rxtx(tp);
- udelay(5);
- }
+ tulip_stop_rxtx(tp);
+ udelay(5);
tulip_start_rxtx(tp);
}
OpenPOWER on IntegriCloud