diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 23:53:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 23:53:48 +0200 |
commit | 3bd19078c215d15e20b4447d9c4aa0065813b207 (patch) | |
tree | 15e77b071e77b99bffdb96d5f01fe917c2ff2cd7 /drivers/block | |
parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually (diff) | |
parent | [PATCH] sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constant (diff) | |
download | linux-3bd19078c215d15e20b4447d9c4aa0065813b207.tar.xz linux-3bd19078c215d15e20b4447d9c4aa0065813b207.zip |
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/sx8.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 5ed3a6379452..9db0a9e3e59c 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -26,6 +26,7 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/hdreg.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/semaphore.h> #include <asm/uaccess.h> @@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out; #if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ - rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); + rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK); if (!rc) { - rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); + rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); if (rc) { printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", pci_name(pdev)); @@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) pci_dac = 1; } else { #endif - rc = pci_set_dma_mask(pdev, 0xffffffffULL); + rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); if (rc) { printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", pci_name(pdev)); |