diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
commit | f9bd170a87948a9e077149b70fb192c563770fdf (patch) | |
tree | c759b57b67ab41a859e19f7dcee571504b368202 /arch/ppc/platforms/chrp_setup.c | |
parent | 25635c71e44111a6bd48f342e144e2fc02d0a314 (diff) |
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.c | 4 |
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) | |||
436 | i8259_irq); | 436 | i8259_irq); |
437 | 437 | ||
438 | } | 438 | } |
439 | for (i = 0; i < NUM_8259_INTERRUPTS; i++) | 439 | i8259_init(chrp_int_ack, 0); |
440 | irq_desc[i].handler = &i8259_pic; | ||
441 | i8259_init(chrp_int_ack); | ||
442 | 440 | ||
443 | #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON) | 441 | #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON) |
444 | /* see if there is a keyboard in the device tree | 442 | /* see if there is a keyboard in the device tree |