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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
m8xx_setup.c
diff --git
a/arch/ppc/syslib/m8xx_setup.c
b/arch/ppc/syslib/m8xx_setup.c
index
dae9af7
..
d8d299b
100644
(file)
--- a/
arch/ppc/syslib/m8xx_setup.c
+++ b/
arch/ppc/syslib/m8xx_setup.c
@@
-10,7
+10,6
@@
* bootup setup stuff..
*/
* bootup setup stuff..
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-170,7
+169,7
@@
abort(void)
}
/* A place holder for time base interrupts, if they are ever enabled. */
}
/* A place holder for time base interrupts, if they are ever enabled. */
-irqreturn_t timebase_interrupt(int irq, void * dev
, struct pt_regs * regs
)
+irqreturn_t timebase_interrupt(int irq, void * dev)
{
printk ("timebase_interrupt()\n");
{
printk ("timebase_interrupt()\n");
@@
-347,13
+346,13
@@
m8xx_init_IRQ(void)
int i;
for (i = SIU_IRQ_OFFSET ; i < SIU_IRQ_OFFSET + NR_SIU_INTS ; i++)
int i;
for (i = SIU_IRQ_OFFSET ; i < SIU_IRQ_OFFSET + NR_SIU_INTS ; i++)
- irq_desc[i].
handler
= &ppc8xx_pic;
+ irq_desc[i].
chip
= &ppc8xx_pic;
cpm_interrupt_init();
#if defined(CONFIG_PCI)
for (i = I8259_IRQ_OFFSET ; i < I8259_IRQ_OFFSET + NR_8259_INTS ; i++)
cpm_interrupt_init();
#if defined(CONFIG_PCI)
for (i = I8259_IRQ_OFFSET ; i < I8259_IRQ_OFFSET + NR_8259_INTS ; i++)
- irq_desc[i].
handler
= &i8259_pic;
+ irq_desc[i].
chip
= &i8259_pic;
i8259_pic_irq_offset = I8259_IRQ_OFFSET;
i8259_init(0);
i8259_pic_irq_offset = I8259_IRQ_OFFSET;
i8259_init(0);