diff options
author | Domen Puncer <domen@coderock.org> | 2005-06-26 18:22:14 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:22:14 -0400 |
commit | 1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4 (patch) | |
tree | 8754be18382901e6143083fa8d7c7d8a76081407 /drivers/net/sungem.c | |
parent | 5ccabb9b45aff50e41d27a5f384ae2d2dd7640de (diff) |
drivers/net/: Use the DMA_{64,32}BIT_MASK constants
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
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 <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r-- | drivers/net/sungem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 5cd50fd53c12..1f5655655c40 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
45 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
46 | #include <linux/pci.h> | 46 | #include <linux/pci.h> |
47 | #include <linux/dma-mapping.h> | ||
47 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
48 | #include <linux/etherdevice.h> | 49 | #include <linux/etherdevice.h> |
49 | #include <linux/skbuff.h> | 50 | #include <linux/skbuff.h> |
@@ -2989,10 +2990,10 @@ static int __devinit gem_init_one(struct pci_dev *pdev, | |||
2989 | */ | 2990 | */ |
2990 | if (pdev->vendor == PCI_VENDOR_ID_SUN && | 2991 | if (pdev->vendor == PCI_VENDOR_ID_SUN && |
2991 | pdev->device == PCI_DEVICE_ID_SUN_GEM && | 2992 | pdev->device == PCI_DEVICE_ID_SUN_GEM && |
2992 | !pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) { | 2993 | !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { |
2993 | pci_using_dac = 1; | 2994 | pci_using_dac = 1; |
2994 | } else { | 2995 | } else { |
2995 | err = pci_set_dma_mask(pdev, (u64) 0xffffffff); | 2996 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
2996 | if (err) { | 2997 | if (err) { |
2997 | printk(KERN_ERR PFX "No usable DMA configuration, " | 2998 | printk(KERN_ERR PFX "No usable DMA configuration, " |
2998 | "aborting.\n"); | 2999 | "aborting.\n"); |