---

yaml --- r: 3419 b: refs/heads/master c: caac3a4 h: refs/heads/master i: 3417: 20cc153 3415: 6cfc6f5 v: v3
git-mirror · Jun 25, 2005 · d4fae47 · d4fae47
1 parent b11cea4
commit d4fae47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}