diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:14:25 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:14:25 -0400 |
commit | a9053d0494d3c92807701c0f47df61d50c971581 (patch) | |
tree | 28cfb17d88d6491c5efd51e00e6937d57b1e81da /drivers/net/tulip/tulip.h | |
parent | 4dd9e909e3b834b66fd48d6eac50c6557cc50275 (diff) | |
parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
download | kernel_samsung_smdk4412-a9053d0494d3c92807701c0f47df61d50c971581.tar.gz kernel_samsung_smdk4412-a9053d0494d3c92807701c0f47df61d50c971581.tar.bz2 kernel_samsung_smdk4412-a9053d0494d3c92807701c0f47df61d50c971581.zip |
/spare/repo/libata-dev branch 'master'
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 20346d847d9..05d2d96f7be 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); } |