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
Merge branch 'master' into upstream-fixes
[pandora-kernel.git]
/
sound
/
oss
/
mpu401.c
diff --git
a/sound/oss/mpu401.c
b/sound/oss/mpu401.c
index
162d07c
..
58d4a5d
100644
(file)
--- a/
sound/oss/mpu401.c
+++ b/
sound/oss/mpu401.c
@@
-432,7
+432,7
@@
static void mpu401_input_loop(struct mpu_config *devc)
devc->m_busy = 0;
}
-static irqreturn_t mpuintr(int irq, void *dev_id
, struct pt_regs *dummy
)
+static irqreturn_t mpuintr(int irq, void *dev_id)
{
struct mpu_config *devc;
int dev = (int) dev_id;