diff options
| author | Jody McIntyre <scjody@steamballoon.com> | 2005-05-16 21:54:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:23 -0700 |
| commit | 2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a (patch) | |
| tree | 862abfd78c5ca1c5badde981c4522225e72f8a16 /drivers/ieee1394 | |
| parent | 616b859fbd0e59707a24612d5b5fec791156c822 (diff) | |
| download | kernel_samsung_crespo-2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a.zip kernel_samsung_crespo-2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a.tar.gz kernel_samsung_crespo-2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a.tar.bz2 | |
[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: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 2689d93..bdb3a85 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c @@ -43,6 +43,7 @@ #include <linux/fs.h> #include <linux/poll.h> #include <linux/kdev_t.h> +#include <linux/dma-mapping.h> #include <asm/byteorder.h> #include <asm/atomic.h> #include <asm/io.h> @@ -1185,7 +1186,7 @@ static int __devinit add_card(struct pci_dev *dev, 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"); if (pci_enable_device(dev)) FAIL("failed to enable PCILynx hardware"); |