From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 3 Jul 2006 12:18:04 +0000 (+0100)
Subject: [ARM] Fix ISA IRQ resources
X-Git-Tag: firefly_0821_release~34396^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=020732ad9add86b71e9d90d5fa7687d51f58ef49;p=firefly-linux-kernel-4.4.55.git

[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: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c
index e1c43b331d64..87448c2d6baa 100644
--- a/arch/arm/mach-footbridge/isa-irq.c
+++ b/arch/arm/mach-footbridge/isa-irq.c
@@ -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)
 {