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) | |
| download | kernel_goldelico_gta04-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.zip kernel_goldelico_gta04-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.tar.gz kernel_goldelico_gta04-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.tar.bz2 | |
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 5cd50fd..1f56556 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -44,6 +44,7 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> @@ -2989,10 +2990,10 @@ static int __devinit gem_init_one(struct pci_dev *pdev, */ if (pdev->vendor == PCI_VENDOR_ID_SUN && pdev->device == PCI_DEVICE_ID_SUN_GEM && - !pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) { + !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { pci_using_dac = 1; } else { - err = pci_set_dma_mask(pdev, (u64) 0xffffffff); + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); if (err) { printk(KERN_ERR PFX "No usable DMA configuration, " "aborting.\n"); |