git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
emu10k1
/
main.c
diff --git
a/sound/oss/emu10k1/main.c
b/sound/oss/emu10k1/main.c
index
23241cb
..
6c59df7
100644
(file)
--- a/
sound/oss/emu10k1/main.c
+++ b/
sound/oss/emu10k1/main.c
@@
-94,6
+94,7
@@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
+#include <linux/dma-mapping.h>
#include "hwaccess.h"
#include "8010.h"
#include "hwaccess.h"
#include "8010.h"
@@
-119,7
+120,7
@@
/* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */
/* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */
-#define EMU10K1_DMA_MASK
0x1fffffff
/* DMA buffer mask for pci_alloc_consist */
+#define EMU10K1_DMA_MASK
DMA_29BIT_MASK
/* DMA buffer mask for pci_alloc_consist */
#ifndef PCI_VENDOR_ID_CREATIVE
#define PCI_VENDOR_ID_CREATIVE 0x1102
#ifndef PCI_VENDOR_ID_CREATIVE
#define PCI_VENDOR_ID_CREATIVE 0x1102
@@
-166,7
+167,7
@@
extern struct file_operations emu10k1_midi_fops;
static struct midi_operations emu10k1_midi_operations;
#endif
static struct midi_operations emu10k1_midi_operations;
#endif
-extern irqreturn_t emu10k1_interrupt(int, void *
, struct pt_regs *s
);
+extern irqreturn_t emu10k1_interrupt(int, void *);
static int __devinit emu10k1_audio_init(struct emu10k1_card *card)
{
static int __devinit emu10k1_audio_init(struct emu10k1_card *card)
{
@@
-1300,7
+1301,7
@@
static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev
card->pci_dev = pci_dev;
/* Reserve IRQ Line */
card->pci_dev = pci_dev;
/* Reserve IRQ Line */
- if (request_irq(card->irq, emu10k1_interrupt,
SA_SHIRQ
, card_names[pci_id->driver_data], card)) {
+ if (request_irq(card->irq, emu10k1_interrupt,
IRQF_SHARED
, card_names[pci_id->driver_data], card)) {
printk(KERN_ERR "emu10k1: IRQ in use\n");
ret = -EBUSY;
goto err_irq;
printk(KERN_ERR "emu10k1: IRQ in use\n");
ret = -EBUSY;
goto err_irq;
@@
-1320,7
+1321,7
@@
static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev
card->is_aps = (subsysvid == EMU_APS_SUBID);
spin_lock_init(&card->lock);
card->is_aps = (subsysvid == EMU_APS_SUBID);
spin_lock_init(&card->lock);
-
init_MUTEX
(&card->open_sem);
+
mutex_init
(&card->open_sem);
card->open_mode = 0;
init_waitqueue_head(&card->open_wait);
card->open_mode = 0;
init_waitqueue_head(&card->open_wait);