diff --git a/[refs] b/[refs]
index b31860c95569..18aca83a5e77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee538a2e867c7fbdb2a5940b610682d5d08e8be
+refs/heads/master: 738c7b4f7f36ce2c547d0a2c2aa397aae904510f
diff --git a/trunk/sound/oss/es1370.c b/trunk/sound/oss/es1370.c
index 056091cff266..886f61c1c34a 100644
--- a/trunk/sound/oss/es1370.c
+++ b/trunk/sound/oss/es1370.c
@@ -156,6 +156,7 @@
 #include <linux/spinlock.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2569,7 +2570,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
 		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 "es1370: architecture does not support 32bit PCI busmaster DMA\n");
 		return i;