aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hp100.c
diff options
context:
space:
mode:
authorDomen Puncer <domen@coderock.org>2005-06-26 18:22:14 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 18:22:14 -0400
commit1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4 (patch)
tree8754be18382901e6143083fa8d7c7d8a76081407 /drivers/net/hp100.c
parent5ccabb9b45aff50e41d27a5f384ae2d2dd7640de (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/hp100.c')
-rw-r--r--drivers/net/hp100.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index c9d1a86d9594..cf0ac6fda1a1 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -106,6 +106,7 @@
106#include <linux/interrupt.h> 106#include <linux/interrupt.h>
107#include <linux/eisa.h> 107#include <linux/eisa.h>
108#include <linux/pci.h> 108#include <linux/pci.h>
109#include <linux/dma-mapping.h>
109#include <linux/spinlock.h> 110#include <linux/spinlock.h>
110#include <linux/netdevice.h> 111#include <linux/netdevice.h>
111#include <linux/etherdevice.h> 112#include <linux/etherdevice.h>
@@ -557,7 +558,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
557 * Also, we can have EISA Busmaster cards (not tested), 558 * Also, we can have EISA Busmaster cards (not tested),
558 * so beware !!! - Jean II */ 559 * so beware !!! - Jean II */
559 if((bus == HP100_BUS_PCI) && 560 if((bus == HP100_BUS_PCI) &&
560 (pci_set_dma_mask(pci_dev, 0xffffffff))) { 561 (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK))) {
561 /* Gracefully fallback to shared memory */ 562 /* Gracefully fallback to shared memory */
562 goto busmasterfail; 563 goto busmasterfail;
563 } 564 }