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/e100.c | |
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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 4a47df5a9ff9..cfaa6b2bf345 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -143,6 +143,7 @@ | |||
143 | #include <linux/delay.h> | 143 | #include <linux/delay.h> |
144 | #include <linux/init.h> | 144 | #include <linux/init.h> |
145 | #include <linux/pci.h> | 145 | #include <linux/pci.h> |
146 | #include <linux/dma-mapping.h> | ||
146 | #include <linux/netdevice.h> | 147 | #include <linux/netdevice.h> |
147 | #include <linux/etherdevice.h> | 148 | #include <linux/etherdevice.h> |
148 | #include <linux/mii.h> | 149 | #include <linux/mii.h> |
@@ -2286,7 +2287,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2286 | goto err_out_disable_pdev; | 2287 | goto err_out_disable_pdev; |
2287 | } | 2288 | } |
2288 | 2289 | ||
2289 | if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) { | 2290 | if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) { |
2290 | DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n"); | 2291 | DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n"); |
2291 | goto err_out_free_res; | 2292 | goto err_out_free_res; |
2292 | } | 2293 | } |