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 master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-reset.c
diff --git
a/arch/mips/sgi-ip22/ip22-reset.c
b/arch/mips/sgi-ip22/ip22-reset.c
index
7a941ec
..
66df5ac
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-reset.c
+++ b/
arch/mips/sgi-ip22/ip22-reset.c
@@
-169,7
+169,7
@@
static inline void volume_down_button(unsigned long data)
}
}
-static irqreturn_t panel_int(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t panel_int(int irq, void *dev_id)
{
unsigned int buttons;