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
[ARM] Merge AT91 and devel branches
[pandora-kernel.git]
/
sound
/
oss
/
sb_common.c
diff --git
a/sound/oss/sb_common.c
b/sound/oss/sb_common.c
index
bbe5b75
..
440537c
100644
(file)
--- a/
sound/oss/sb_common.c
+++ b/
sound/oss/sb_common.c
@@
-132,7
+132,7
@@
static void sb_intr (sb_devc *devc)
if (src & 4) /* MPU401 interrupt */
if(devc->midi_irq_cookie)
if (src & 4) /* MPU401 interrupt */
if(devc->midi_irq_cookie)
- uart401intr(devc->irq, devc->midi_irq_cookie
, NULL
);
+ uart401intr(devc->irq, devc->midi_irq_cookie);
if (!(src & 3))
return; /* Not a DSP interrupt */
if (!(src & 3))
return; /* Not a DSP interrupt */
@@
-200,7
+200,7
@@
static void pci_intr(sb_devc *devc)
sb_intr(devc);
}
sb_intr(devc);
}
-static irqreturn_t sbintr(int irq, void *dev_id
, struct pt_regs *dummy
)
+static irqreturn_t sbintr(int irq, void *dev_id)
{
sb_devc *devc = dev_id;
{
sb_devc *devc = dev_id;