From: Palmer Dabbelt <palmer@sifive.com>
Date: Fri, 22 Jun 2018 22:46:28 +0000 (-0700)
Subject: RISC-V: Don't include irq-riscv-intc.h
X-Git-Tag: v4.17.19~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f50e90b6afbefbb65886df4ce713af41fe348c;p=thirdparty%2Fkernel%2Fstable.git

RISC-V: Don't include irq-riscv-intc.h

[ Upstream commit 8606544890d7dc4f7a740963f70dc1e1d54f8e30 ]

This file has never existed in the upstream kernel, but it's guarded by
an #ifdef that's also never existed in the upstream kernel.  As a part
of our interrupt controller refactoring this header is no longer
necessary, but this reference managed to sneak in anyway.

Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c
index b74cbfbce2d0d..7bcdaed15703b 100644
--- a/arch/riscv/kernel/irq.c
+++ b/arch/riscv/kernel/irq.c
@@ -16,10 +16,6 @@
 #include <linux/irqchip.h>
 #include <linux/irqdomain.h>
 
-#ifdef CONFIG_RISCV_INTC
-#include <linux/irqchip/irq-riscv-intc.h>
-#endif
-
 void __init init_IRQ(void)
 {
 	irqchip_init();