Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 020732ad authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix ISA IRQ resources 



The ISA IRQ code was not using named initialisers, so merging the
64-bit resource code (which re-ordered the struct members) broke
this.  Fix it up to use named initialisers.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 906243d0

arch/arm/mach-footbridge/isa-irq.c

+16 −3
Original line number Diff line number Diff line
@@ -98,9 +98,22 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) 
	desc_handle_irq(isa_irq, desc, regs);

}



static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", };

static struct resource pic1_resource = { "pic1", 0x20, 0x3f };

static struct resource pic2_resource = { "pic2", 0xa0, 0xbf };

static struct irqaction irq_cascade = {

	.handler = no_action,

	.name = "cascade",

};



static struct resource pic1_resource = {

	.name	= "pic1",

	.start	= 0x20,

	.end	= 0x3f,

};



static struct resource pic2_resource = {

	.name	= "pic2",

	.start	= 0xa0,

	.end	= 0xbf,

};



void __init isa_init_irq(unsigned int host_irq)

{