drivers/net/acenic: Use the DMA_{64,
Subsystems (2)
PATCH 2/16 drivers/net/acenic: Use the DMA_{64,
The previous patch did not compile cleanly on all architectures so here's a fixed one.
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 <[email protected]>
drivers/net/acenic.c +3 -2
@@ -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/* * 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 ;
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors