diff --git a/[refs] b/[refs]
index 72fae4a6ec46..6f0407674888 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f90e7185ee00c1faa9d07b2f669d124772fdba17
+refs/heads/master: caac3a444ce3b5a8d76069abfbb699d2a65b3f09
diff --git a/trunk/sound/oss/esssolo1.c b/trunk/sound/oss/esssolo1.c
index 6b3b9a99579d..fb09065d07c8 100644
--- a/trunk/sound/oss/esssolo1.c
+++ b/trunk/sound/oss/esssolo1.c
@@ -104,6 +104,7 @@
 #include <linux/smp_lock.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2326,7 +2327,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
 	 * to 24 bits first, then 32 bits (playback only) if that fails.
 	 */
 	if (pci_set_dma_mask(pcidev, 0x00ffffff) &&
-	    pci_set_dma_mask(pcidev, 0xffffffff)) {
+	    pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
 		printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
 		return -ENODEV;
 	}