aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/pplus.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-26 02:47:42 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-26 02:47:42 -0400
commitf9bd170a87948a9e077149b70fb192c563770fdf (patch)
treec759b57b67ab41a859e19f7dcee571504b368202 /arch/ppc/platforms/pplus.c
parent25635c71e44111a6bd48f342e144e2fc02d0a314 (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/pplus.c')
-rw-r--r--arch/ppc/platforms/pplus.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c
index 59eb330b2090..22bd40cfb092 100644
--- a/arch/ppc/platforms/pplus.c
+++ b/arch/ppc/platforms/pplus.c
@@ -665,10 +665,7 @@ static void __init pplus_init_IRQ(void)
665 ppc_md.get_irq = openpic_get_irq; 665 ppc_md.get_irq = openpic_get_irq;
666 } 666 }
667 667
668 for (i = 0; i < NUM_8259_INTERRUPTS; i++) 668 i8259_init(0, 0);
669 irq_desc[i].handler = &i8259_pic;
670
671 i8259_init(0);
672 669
673 if (ppc_md.progress) 670 if (ppc_md.progress)
674 ppc_md.progress("init_irq: exit", 0); 671 ppc_md.progress("init_irq: exit", 0);