git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
[pandora-kernel.git]
/
sound
/
pci
/
es1968.c
diff --git
a/sound/pci/es1968.c
b/sound/pci/es1968.c
index
99ea932
..
297a151
100644
(file)
--- a/
sound/pci/es1968.c
+++ b/
sound/pci/es1968.c
@@
-102,7
+102,7
@@
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/gameport.h>
-#include <linux/module
param
.h>
+#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/input.h>
#include <linux/mutex.h>
#include <linux/input.h>
@@
-2843,8
+2843,9
@@
static int __devinit snd_es1968_probe(struct pci_dev *pci,
if (enable_mpu[dev]) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
chip->io_port + ESM_MPU401_PORT,
if (enable_mpu[dev]) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
chip->io_port + ESM_MPU401_PORT,
- MPU401_INFO_INTEGRATED,
- chip->irq, 0, &chip->rmidi)) < 0) {
+ MPU401_INFO_INTEGRATED |
+ MPU401_INFO_IRQ_HOOK,
+ -1, &chip->rmidi)) < 0) {
printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");
}
}
printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");
}
}