Skip to content

Commit

Permalink
[ARM] Fix ISA IRQ resources
Browse files Browse the repository at this point in the history
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: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Jul 3, 2006
1 parent 906243d commit 020732a
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions arch/arm/mach-footbridge/isa-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 020732a

Please sign in to comment.