diff --git a/[refs] b/[refs]
index 18aca83a5e77..d37c4258dd28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 738c7b4f7f36ce2c547d0a2c2aa397aae904510f
+refs/heads/master: 4f11842ebbb3b98a88c38ef6c18345ccc792a54b
diff --git a/trunk/sound/oss/cmpci.c b/trunk/sound/oss/cmpci.c
index 34720e66dae1..74dcca78c6c0 100644
--- a/trunk/sound/oss/cmpci.c
+++ b/trunk/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;