aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/tulip.h
diff options
context:
space:
mode:
authorPeer Chen <Peer.Chen@uli.com.tw>2005-08-11 15:09:23 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-11 15:09:23 -0400
commitea8f400c98ec9ae0604bc5a6721174ef68635815 (patch)
treee3efacd1bc34f9a6cee8632b8ac4a34512c204f3 /drivers/net/tulip/tulip.h
parent4689ced99b18937e28c0f6c190394ccc3c61d651 (diff)
[netdrvr tulip] Remove ULi-specific code from generic tulip driver
It has a separate driver now, 'uli526x'.
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 {
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
483static inline void tulip_restart_rxtx(struct tulip_private *tp) 482static 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