diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /sound/oss/cmpci.c | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
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 34720e66dae1..74dcca78c6c0 100644 --- a/sound/oss/cmpci.c +++ b/sound/oss/cmpci.c | |||
@@ -123,6 +123,7 @@ | |||
123 | #include <linux/smp_lock.h> | 123 | #include <linux/smp_lock.h> |
124 | #include <linux/bitops.h> | 124 | #include <linux/bitops.h> |
125 | #include <linux/wait.h> | 125 | #include <linux/wait.h> |
126 | #include <linux/dma-mapping.h> | ||
126 | 127 | ||
127 | #include <asm/io.h> | 128 | #include <asm/io.h> |
128 | #include <asm/page.h> | 129 | #include <asm/page.h> |
@@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id | |||
3058 | return -ENODEV; | 3059 | return -ENODEV; |
3059 | if (pcidev->irq == 0) | 3060 | if (pcidev->irq == 0) |
3060 | return -ENODEV; | 3061 | return -ENODEV; |
3061 | i = pci_set_dma_mask(pcidev, 0xffffffff); | 3062 | i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); |
3062 | if (i) { | 3063 | if (i) { |
3063 | printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n"); | 3064 | printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n"); |
3064 | return i; | 3065 | return i; |