diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:53:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:53:48 -0400 |
commit | 3bd19078c215d15e20b4447d9c4aa0065813b207 (patch) | |
tree | 15e77b071e77b99bffdb96d5f01fe917c2ff2cd7 /sound/oss | |
parent | 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (diff) | |
parent | 3e90928d81449ee10a06bc306916503d5c284a25 (diff) |
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.c | 5 |
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 @@ | |||
35 | #include <linux/smp_lock.h> | 35 | #include <linux/smp_lock.h> |
36 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
38 | #include <linux/dma-mapping.h> | ||
38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
39 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
40 | #include <asm/semaphore.h> | 41 | #include <asm/semaphore.h> |
@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device | |||
3391 | if (rc) | 3392 | if (rc) |
3392 | goto err_out_disable; | 3393 | goto err_out_disable; |
3393 | 3394 | ||
3394 | rc = pci_set_dma_mask(pdev, 0xffffffffULL); | 3395 | rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
3395 | if (rc) | 3396 | if (rc) |
3396 | goto err_out_res; | 3397 | goto err_out_res; |
3397 | rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); | 3398 | rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); |
3398 | if (rc) | 3399 | if (rc) |
3399 | goto err_out_res; | 3400 | goto err_out_res; |
3400 | 3401 | ||