diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 23:38:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 23:38:58 -0400 |
| commit | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (patch) | |
| tree | 16fbe6ba431bcf949ee8645510b0c2fd39b5810f /sound/oss/cmpci.c | |
| parent | 66b04a80eea60cabf9d89fd34deb3234a740052f (diff) | |
| parent | 020f46a39eb7b99a575b9f4d105fce2b142acdf1 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/oss/cmpci.c')
| -rw-r--r-- | sound/oss/cmpci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c index 34720e66dae..74dcca78c6c 100644 --- a/sound/oss/cmpci.c +++ b/sound/oss/cmpci.c @@ -123,6 +123,7 @@ #include <linux/smp_lock.h> #include <linux/bitops.h> #include <linux/wait.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/page.h> @@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id return -ENODEV; if (pcidev->irq == 0) return -ENODEV; - i = pci_set_dma_mask(pcidev, 0xffffffff); + i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); if (i) { printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n"); return i; |