git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
mpc52xx_pic.c
diff --git
a/arch/ppc/syslib/mpc52xx_pic.c
b/arch/ppc/syslib/mpc52xx_pic.c
index
4c4497e
..
af35a31
100644
(file)
--- a/
arch/ppc/syslib/mpc52xx_pic.c
+++ b/
arch/ppc/syslib/mpc52xx_pic.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/syslib/mpc52xx_pic.c
- *
* Programmable Interrupt Controller functions for the Freescale MPC52xx
* embedded CPU.
*
* Programmable Interrupt Controller functions for the Freescale MPC52xx
* embedded CPU.
*
@@
-206,9
+204,9
@@
mpc52xx_init_irq(void)
out_be32(&intr->main_pri1, 0);
out_be32(&intr->main_pri2, 0);
out_be32(&intr->main_pri1, 0);
out_be32(&intr->main_pri2, 0);
- /* Initialize irq_desc[i].
handler
's with mpc52xx_ic. */
+ /* Initialize irq_desc[i].
chip
's with mpc52xx_ic. */
for (i = 0; i < NR_IRQS; i++) {
for (i = 0; i < NR_IRQS; i++) {
- irq_desc[i].
handler
= &mpc52xx_ic;
+ irq_desc[i].
chip
= &mpc52xx_ic;
irq_desc[i].status = IRQ_LEVEL;
}
irq_desc[i].status = IRQ_LEVEL;
}
@@
-222,7
+220,7
@@
mpc52xx_init_irq(void)
}
int
}
int
-mpc52xx_get_irq(
struct pt_regs *regs
)
+mpc52xx_get_irq(
void
)
{
u32 status;
int irq = -1;
{
u32 status;
int irq = -1;