summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-05-13 04:20:53 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-05-13 04:20:53 +0200
commit10a87fcf40ce8cee1e85d936cd6d7662943c804e (patch)
treec2b0237c481de884e89aed19b2bad6a195599135 /drivers/net
parent [PATCH] drivers/net/tulip/dmfe: Use the DMA_32BIT_MASK constant (diff)
downloadlinux-10a87fcf40ce8cee1e85d936cd6d7662943c804e.tar.xz
linux-10a87fcf40ce8cee1e85d936cd6d7662943c804e.zip
[PATCH] drivers/net/tulip/winbond-840: Use the DMA_32BIT_MASK constant
The previous patch did not compile cleanly on all architectures so here's a fixed one. Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tulip/winbond-840.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index caff2f590165..db4b32c2369a 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -121,6 +121,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
+#include <linux/dma-mapping.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
@@ -394,7 +395,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
irq = pdev->irq;
- if (pci_set_dma_mask(pdev,0xFFFFffff)) {
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n",
pci_name(pdev));
return -EIO;