From: Michal Simek Date: Tue, 27 Jan 2015 11:44:12 +0000 (+0100) Subject: microblaze: Use standard interrupt_init() function X-Git-Tag: v2015.04-rc2~36^2~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c7c32fa7f025a87cfdb4afce4a6dda78a8c5582;p=u-boot microblaze: Use standard interrupt_init() function Do not use microblaze specific interrupt init function. Signed-off-by: Michal Simek --- diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index f66ec69ee2..b6d6610f2f 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -109,7 +109,7 @@ static void intc_init(void) intc->iar, intc->mer); } -int interrupts_init(void) +int interrupt_init(void) { int i; diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h index 0fb9207882..65868386b0 100644 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ b/arch/microblaze/include/asm/microblaze_intc.h @@ -34,5 +34,3 @@ struct irq_action { */ int install_interrupt_handler(int irq, interrupt_handler_t *hdlr, void *arg); - -int interrupts_init(void); diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 600c80ab76..bd028a63c0 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -55,7 +55,7 @@ init_fnc_t *init_sequence[] = { #endif display_banner, #ifndef CONFIG_SPL_BUILD - interrupts_init, + interrupt_init, timer_init, #endif NULL,