From 5aa4eb097fc046d63ffdaca43e5180a5392ac35f Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Thu, 1 Dec 2005 11:14:00 +0100
Subject: [PATCH] --- yaml --- r: 16145 b: refs/heads/master c:
 58da3a23fe12b1c4730cb85af203950c7707220c h: refs/heads/master i:   16143:
 500ad260b949b5101a4a1195f7626234823df335 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/au88x0/au88x0.c | 4 ++--
 trunk/sound/pci/au88x0/au88x0.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fb2a27f9ca98..1a9f27d37d86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59d48582508c6e3ed6f60bdd7d13e3e2893416b4
+refs/heads/master: 58da3a23fe12b1c4730cb85af203950c7707220c
diff --git a/trunk/sound/pci/au88x0/au88x0.c b/trunk/sound/pci/au88x0/au88x0.c
index 7c547859ae00..7d9184f7367a 100644
--- a/trunk/sound/pci/au88x0/au88x0.c
+++ b/trunk/sound/pci/au88x0/au88x0.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
 #include <sound/initval.h>
 
 // module parameters (see "Module Parameters")
@@ -150,11 +151,10 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
 	// check PCI availability (DMA).
 	if ((err = pci_enable_device(pci)) < 0)
 		return err;
-	if (!pci_dma_supported(pci, VORTEX_DMA_MASK)) {
+	if (pci_set_dma_mask(pci, DMA_32BIT_MASK)) {
 		printk(KERN_ERR "error to set DMA mask\n");
 		return -ENXIO;
 	}
-	pci_set_dma_mask(pci, VORTEX_DMA_MASK);
 
 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 	if (chip == NULL)
diff --git a/trunk/sound/pci/au88x0/au88x0.h b/trunk/sound/pci/au88x0/au88x0.h
index 745f995a20dd..c2ad2674bea7 100644
--- a/trunk/sound/pci/au88x0/au88x0.h
+++ b/trunk/sound/pci/au88x0/au88x0.h
@@ -39,8 +39,6 @@
 #include "au88x0_wt.h"
 #endif
 
-#define	VORTEX_DMA_MASK	0xffffffff
-
 #define	hwread(x,y) readl((x)+((y)>>2))
 #define	hwwrite(x,y,z) writel((z),(x)+((y)>>2))