Commit 2554bd2a authored by Jody McIntyre's avatar Jody McIntyre Committed by Linus Torvalds

[PATCH] ieee1394: drivers/ieee1394/pcilynx.c: Use the DMA_32BIT_MASK constant

Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() These patches include
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: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarJody McIntyre <scjody@steamballoon.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 616b859f
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <linux/dma-mapping.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -1185,7 +1186,7 @@ static int __devinit add_card(struct pci_dev *dev, ...@@ -1185,7 +1186,7 @@ static int __devinit add_card(struct pci_dev *dev,
error = -ENXIO; error = -ENXIO;
if (pci_set_dma_mask(dev, 0xffffffff)) if (pci_set_dma_mask(dev, DMA_32BIT_MASK))
FAIL("DMA address limits not supported for PCILynx hardware"); FAIL("DMA address limits not supported for PCILynx hardware");
if (pci_enable_device(dev)) if (pci_enable_device(dev))
FAIL("failed to enable PCILynx hardware"); FAIL("failed to enable PCILynx hardware");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment