summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:53:48 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:53:48 -0700
commit3bd19078c215d15e20b4447d9c4aa0065813b207 (patch)
tree15e77b071e77b99bffdb96d5f01fe917c2ff2cd7 /sound/oss
parent3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (diff)
parent3e90928d81449ee10a06bc306916503d5c284a25 (diff)
downloadlinux-3bd19078c215d15e20b4447d9c4aa0065813b207.tar.gz
linux-3bd19078c215d15e20b4447d9c4aa0065813b207.tar.bz2
linux-3bd19078c215d15e20b4447d9c4aa0065813b207.zip
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/via82cxxx_audio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index b387e1e52485..83edda93f0b4 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -35,6 +35,7 @@
#include <linux/smp_lock.h>
#include <linux/ioport.h>
#include <linux/delay.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device
if (rc)
goto err_out_disable;
- rc = pci_set_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc)
goto err_out_res;
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc)
goto err_out_res;