From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Fri, 13 May 2005 02:20:53 +0000 (-0400)
Subject:   [PATCH] drivers/net/tulip/winbond-840: Use the DMA_32BIT_MASK constant
X-Git-Tag: v2.6.13-rc1~98
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10a87fcf40ce8cee1e85d936cd6d7662943c804e;p=linux-2.6

  [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>
---

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index caff2f5901..db4b32c236 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;