git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
ppc
/
syslib
/
ppc403_pic.c
diff --git
a/arch/ppc/syslib/ppc403_pic.c
b/arch/ppc/syslib/ppc403_pic.c
index 1584c8b1229f76bac6627a939c4d3efd9b206d4d..c3b7b8bfbcfe164f92b18a9627b8d06b7823ef5f 100644
(file)
--- a/
arch/ppc/syslib/ppc403_pic.c
+++ b/
arch/ppc/syslib/ppc403_pic.c
@@
-42,7
+42,7
@@
static struct hw_interrupt_type ppc403_aic = {
};
int
-ppc403_pic_get_irq(
struct pt_regs *regs
)
+ppc403_pic_get_irq(
void
)
{
int irq;
unsigned long bits;
@@
-112,7
+112,7
@@
ppc4xx_pic_init(void)
/*
* Disable all external interrupts until they are
- * explicity requested.
+ * explicit
l
y requested.
*/
ppc_cached_irq_mask[0] = 0;