tree e1c925bb8c981f4051f78432ed4d330018fa760e parent 070d01651296d3c87bca94f3b1313447e9e06c2f author Tobias Klauser <[EMAIL PROTECTED]> Tue, 21 Jun 2005 04:28:40 -0700 committer Jeff Garzik <[EMAIL PROTECTED]> Tue, 28 Jun 2005 07:25:10 -0400
[PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <[EMAIL PROTECTED]> Cc: Jeff Garzik <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> drivers/net/wireless/ipw2100.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -146,6 +146,7 @@ that only one external action is invoked #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_ 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 p 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"); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
