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/wan | |
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/wan')
-rw-r--r-- | drivers/net/wan/wanxl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index 1e7b47704ad9..9c1e10602f2b 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
27 | #include <linux/hdlc.h> | 27 | #include <linux/hdlc.h> |
28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
29 | #include <linux/dma-mapping.h> | ||
29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
30 | #include <asm/delay.h> | 31 | #include <asm/delay.h> |
31 | 32 | ||
@@ -624,8 +625,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev, | |||
624 | /* FIXME when PCI/DMA subsystems are fixed. | 625 | /* FIXME when PCI/DMA subsystems are fixed. |
625 | We set both dma_mask and consistent_dma_mask back to 32 bits | 626 | We set both dma_mask and consistent_dma_mask back to 32 bits |
626 | to indicate the card can do 32-bit DMA addressing */ | 627 | to indicate the card can do 32-bit DMA addressing */ |
627 | if (pci_set_consistent_dma_mask(pdev, 0xFFFFFFFF) || | 628 | if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) || |
628 | pci_set_dma_mask(pdev, 0xFFFFFFFF)) { | 629 | pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { |
629 | printk(KERN_ERR "wanXL: No usable DMA configuration\n"); | 630 | printk(KERN_ERR "wanXL: No usable DMA configuration\n"); |
630 | wanxl_pci_remove_one(pdev); | 631 | wanxl_pci_remove_one(pdev); |
631 | return -EIO; | 632 | return -EIO; |