diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-05-12 22:20:53 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 22:20:53 -0400 |
commit | 10a87fcf40ce8cee1e85d936cd6d7662943c804e (patch) | |
tree | c2b0237c481de884e89aed19b2bad6a195599135 /drivers/net/tulip/winbond-840.c | |
parent | cb199d42e18466e471fa46dc53413402a4ae93e7 (diff) |
[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/tulip/winbond-840.c')
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 3 |
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}; | |||
121 | #include <linux/slab.h> | 121 | #include <linux/slab.h> |
122 | #include <linux/interrupt.h> | 122 | #include <linux/interrupt.h> |
123 | #include <linux/pci.h> | 123 | #include <linux/pci.h> |
124 | #include <linux/dma-mapping.h> | ||
124 | #include <linux/netdevice.h> | 125 | #include <linux/netdevice.h> |
125 | #include <linux/etherdevice.h> | 126 | #include <linux/etherdevice.h> |
126 | #include <linux/skbuff.h> | 127 | #include <linux/skbuff.h> |
@@ -394,7 +395,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev, | |||
394 | 395 | ||
395 | irq = pdev->irq; | 396 | irq = pdev->irq; |
396 | 397 | ||
397 | if (pci_set_dma_mask(pdev,0xFFFFffff)) { | 398 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { |
398 | printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n", | 399 | printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n", |
399 | pci_name(pdev)); | 400 | pci_name(pdev)); |
400 | return -EIO; | 401 | return -EIO; |