aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-06-16 16:46:08 -0400
committerRalf Baechle <ralf@linux-mips.org>2016-08-03 01:54:49 -0400
commit891ab0642fe816adac88141e3561493071400367 (patch)
treee668e4d6432c11d7d86a6a203d0c28fc808a9ec8
parent0d8d83d0447deb526c3125250eb391b5d76a3472 (diff)
MIPS: Lantiq: Fix build failure
Some configs of mips like xway_defconffig are failing with the error: arch/mips/lantiq/irq.c:209:2: error: initialization from incompatible pointer type [-Werror] "icu", ^ arch/mips/lantiq/irq.c:209:2: error: (near initialization for 'ltq_irq_type.parent_device') [-Werror] arch/mips/lantiq/irq.c:219:2: error: initialization from incompatible pointer type [-Werror] "eiu", ^ arch/mips/lantiq/irq.c:219:2: error: (near initialization for 'ltq_eiu_type.parent_device') [-Werror] The first member of the "struct irq" is no longer a pointer for the name. Fixes: be45beb2df69 ("genirq: Add runtime power management support for IRQ chips") Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> Acked-by: John Crispin <john@phrozen.org> Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13684/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/lantiq/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index 67495beaf8eb..ac4f2fa7ccef 100644
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -206,7 +206,7 @@ static void ltq_shutdown_eiu_irq(struct irq_data *d)
206} 206}
207 207
208static struct irq_chip ltq_irq_type = { 208static struct irq_chip ltq_irq_type = {
209 "icu", 209 .name = "icu",
210 .irq_enable = ltq_enable_irq, 210 .irq_enable = ltq_enable_irq,
211 .irq_disable = ltq_disable_irq, 211 .irq_disable = ltq_disable_irq,
212 .irq_unmask = ltq_enable_irq, 212 .irq_unmask = ltq_enable_irq,
@@ -216,7 +216,7 @@ static struct irq_chip ltq_irq_type = {
216}; 216};
217 217
218static struct irq_chip ltq_eiu_type = { 218static struct irq_chip ltq_eiu_type = {
219 "eiu", 219 .name = "eiu",
220 .irq_startup = ltq_startup_eiu_irq, 220 .irq_startup = ltq_startup_eiu_irq,
221 .irq_shutdown = ltq_shutdown_eiu_irq, 221 .irq_shutdown = ltq_shutdown_eiu_irq,
222 .irq_enable = ltq_enable_irq, 222 .irq_enable = ltq_enable_irq,