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 git://git.linux-xtensa.org/kernel/xtensa-feed
[pandora-kernel.git]
/
arch
/
ppc
/
syslib
/
ppc403_pic.c
diff --git
a/arch/ppc/syslib/ppc403_pic.c
b/arch/ppc/syslib/ppc403_pic.c
index
ce4d1de
..
c3b7b8b
100644
(file)
--- a/
arch/ppc/syslib/ppc403_pic.c
+++ b/
arch/ppc/syslib/ppc403_pic.c
@@
-26,6
+26,7
@@
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/ppc4xx_pic.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/ppc4xx_pic.h>
+#include <asm/machdep.h>
/* Function Prototypes */
/* Function Prototypes */
@@
-41,7
+42,7
@@
static struct hw_interrupt_type ppc403_aic = {
};
int
};
int
-ppc403_pic_get_irq(
struct pt_regs *regs
)
+ppc403_pic_get_irq(
void
)
{
int irq;
unsigned long bits;
{
int irq;
unsigned long bits;
@@
-111,7
+112,7
@@
ppc4xx_pic_init(void)
/*
* Disable all external interrupts until they are
/*
* Disable all external interrupts until they are
- * explicity requested.
+ * explicit
l
y requested.
*/
ppc_cached_irq_mask[0] = 0;
*/
ppc_cached_irq_mask[0] = 0;
@@
-120,5
+121,5
@@
ppc4xx_pic_init(void)
ppc_md.get_irq = ppc403_pic_get_irq;
for (i = 0; i < NR_IRQS; i++)
ppc_md.get_irq = ppc403_pic_get_irq;
for (i = 0; i < NR_IRQS; i++)
- irq_desc[i].
handler
= &ppc403_aic;
+ irq_desc[i].
chip
= &ppc403_aic;
}
}