diff options
author | Valerie Henson <val_henson@linux.intel.com> | 2007-03-12 05:31:29 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:00:58 -0400 |
commit | b3bff39a2b3574542f5007e19038393dfdd64c85 (patch) | |
tree | 4e4f8caf4a9be3c215972c8e50c7198f279c076b /drivers/net/tulip/tulip.h | |
parent | c28896a4244e2fbe28c94e3a6048625f5c15cab4 (diff) |
TULIP: Fix for 64-bit MIPS
From: Jim Gifford <maillist@jg555.com>, Grant Grundler <grundler@parisc-linux.org>, Peter Horton <pdh@colonel-panic.org>
With Grant's help I was able to get the tulip driver to work with 64 bit
MIPS.
[VAL: I'm happy with the 1.5 ms max delay; it doesn't seem excessive.]
Signed-off-by: Valerie Henson <val_henson@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip/tulip.h')
-rw-r--r-- | drivers/net/tulip/tulip.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h index 25f25da76917..ceac47e775ce 100644 --- a/drivers/net/tulip/tulip.h +++ b/drivers/net/tulip/tulip.h | |||
@@ -482,8 +482,11 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp) | |||
482 | udelay(10); | 482 | udelay(10); |
483 | 483 | ||
484 | if (!i) | 484 | if (!i) |
485 | printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n", | 485 | printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed" |
486 | pci_name(tp->pdev)); | 486 | " (CSR5 0x%x CSR6 0x%x)\n", |
487 | pci_name(tp->pdev), | ||
488 | ioread32(ioaddr + CSR5), | ||
489 | ioread32(ioaddr + CSR6)); | ||
487 | } | 490 | } |
488 | } | 491 | } |
489 | 492 | ||