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/acenic.c | |
| parent | 5ccabb9b45aff50e41d27a5f384ae2d2dd7640de (diff) | |
| download | kernel_samsung_smdk4412-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.zip kernel_samsung_smdk4412-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.tar.gz kernel_samsung_smdk4412-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/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 6eea3a8..dbecc6b 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -58,6 +58,7 @@ #include <linux/errno.h> #include <linux/ioport.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> @@ -1167,9 +1168,9 @@ static int __devinit ace_init(struct net_device *dev) /* * Configure DMA attributes. */ - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { ap->pci_using_dac = 1; - } else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) { + } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { ap->pci_using_dac = 0; } else { ecode = -ENODEV; |