projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[powerpc.git]
/
sound
/
isa
/
dt019x.c
diff --git
a/sound/isa/dt019x.c
b/sound/isa/dt019x.c
index
0acb4e5
..
ce57d52
100644
(file)
--- a/
sound/isa/dt019x.c
+++ b/
sound/isa/dt019x.c
@@
-23,7
+23,6
@@
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/driver.h>
#include <linux/init.h>
-#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/pnp.h>
#include <linux/moduleparam.h>
#include <linux/wait.h>
#include <linux/pnp.h>
#include <linux/moduleparam.h>
@@
-240,7
+239,7
@@
static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
MPU401_HW_MPU401,
mpu_port[dev], 0,
mpu_irq[dev],
MPU401_HW_MPU401,
mpu_port[dev], 0,
mpu_irq[dev],
- mpu_irq[dev] >= 0 ?
SA_INTERRUPT
: 0,
+ mpu_irq[dev] >= 0 ?
IRQF_DISABLED
: 0,
NULL) < 0)
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
}
NULL) < 0)
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
}