drivers/net/sungem: Use the DMA_{64,
Subsystems (2)
PATCH 8/16 drivers/net/sungem: 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/sungem.c +3 -2
@@ -28,6 +28,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>
@@ -2816,10 +2817,10 @@ static int __devinit gem_init_one(struct*/ 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");
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors