From e2ff24ede2ddb4713a6d2deaa016ad00413d71f0 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Thu, 12 May 2005 22:20:53 -0400
Subject: [PATCH] --- yaml --- r: 1089 b: refs/heads/master c:
 10a87fcf40ce8cee1e85d936cd6d7662943c804e h: refs/heads/master i:   1087:
 7cd58aec3bd4f5a735a84e39081df8c706e1ebf2 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/tulip/winbond-840.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 367b11c65593..a4540ea85e4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb199d42e18466e471fa46dc53413402a4ae93e7
+refs/heads/master: 10a87fcf40ce8cee1e85d936cd6d7662943c804e
diff --git a/trunk/drivers/net/tulip/winbond-840.c b/trunk/drivers/net/tulip/winbond-840.c
index caff2f590165..db4b32c2369a 100644
--- a/trunk/drivers/net/tulip/winbond-840.c
+++ b/trunk/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;