summaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/chrp_setup.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-26 16:47:42 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-26 16:47:42 +1000
commitf9bd170a87948a9e077149b70fb192c563770fdf (patch)
treec759b57b67ab41a859e19f7dcee571504b368202 /arch/ppc/platforms/chrp_setup.c
parent25635c71e44111a6bd48f342e144e2fc02d0a314 (diff)
downloadlinux-f9bd170a87948a9e077149b70fb192c563770fdf.tar.bz2
powerpc: Merge i8259.c into arch/powerpc/sysdev
This changes the parameters for i8259_init so that it takes two parameters: a physical address for generating an interrupt acknowledge cycle, and an interrupt number offset. i8259_init now sets the irq_desc[] for its interrupts; all the callers were doing this, and that code is gone now. This also defines a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and makes the platforms that need it select that symbol. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/chrp_setup.c')
-rw-r--r--arch/ppc/platforms/chrp_setup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index 56c53bb3dfd4..dad81ffd4013 100644
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -436,9 +436,7 @@ void __init chrp_init_IRQ(void)
i8259_irq);
}
- for (i = 0; i < NUM_8259_INTERRUPTS; i++)
- irq_desc[i].handler = &i8259_pic;
- i8259_init(chrp_int_ack);
+ i8259_init(chrp_int_ack, 0);
#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
/* see if there is a keyboard in the device tree