diff --git a/[refs] b/[refs]
index 6f0407674888..b31860c95569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caac3a444ce3b5a8d76069abfbb699d2a65b3f09
+refs/heads/master: 3ee538a2e867c7fbdb2a5940b610682d5d08e8be
diff --git a/trunk/sound/oss/es1371.c b/trunk/sound/oss/es1371.c
index a50fddaeea21..9266b777387b 100644
--- a/trunk/sound/oss/es1371.c
+++ b/trunk/sound/oss/es1371.c
@@ -128,6 +128,7 @@
 #include <linux/ac97_codec.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2804,7 +2805,7 @@ static int __devinit es1371_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 "es1371: architecture does not support 32bit PCI busmaster DMA\n");
 		return i;