From 27ab4b83db7cac309c491b59237d32ca7d152ae5 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Mon, 20 Jun 2005 14:28:40 -0700
Subject: [PATCH] --- yaml --- r: 6723 b: refs/heads/master c:
 05743d165be9f0293b4ff67f4e1cf3724eb13e1f h: refs/heads/master i:   6721:
 3f210a415ec4e1ba2b5febed537b539f42cc7470   6719:
 2a392a668b4308fbec94890f828a2b7a301c1dff v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2100.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f02cf793bdbb..16c322f2af80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 070d01651296d3c87bca94f3b1313447e9e06c2f
+refs/heads/master: 05743d165be9f0293b4ff67f4e1cf3724eb13e1f
diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c
index 69d7787b44b9..2f2ae1777805 100644
--- a/trunk/drivers/net/wireless/ipw2100.c
+++ b/trunk/drivers/net/wireless/ipw2100.c
@@ -146,6 +146,7 @@ that only one external action is invoked at a time.
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <asm/uaccess.h>
@@ -6423,10 +6424,6 @@ static struct net_device *ipw2100_alloc_device(
 	return dev;
 }
 
-
-
-#define PCI_DMA_32BIT   0x00000000ffffffffULL
-
 static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 				const struct pci_device_id *ent)
 {
@@ -6480,7 +6477,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 	pci_set_master(pci_dev);
 	pci_set_drvdata(pci_dev, priv);
 
-	err = pci_set_dma_mask(pci_dev, PCI_DMA_32BIT);
+	err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
 	if (err) {
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling pci_set_dma_mask.\n");