diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 11:16:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 11:16:30 -0700 |
| commit | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch) | |
| tree | 09933113cf28f253db1dd539463bdab741d67139 /drivers/net/tulip/tulip.h | |
| parent | 62c592edead3c3a045662595f7ade3c12f133373 (diff) | |
| parent | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (diff) | |
| download | linux-next-6b39374a27eb4be7e9d82145ae270ba02ea90dc8.tar.gz | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
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 { 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); } |