Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758166AbbGGVwz (ORCPT ); Tue, 7 Jul 2015 17:52:55 -0400 Received: from 18.mo3.mail-out.ovh.net ([87.98.172.162]:56633 "EHLO 18.mo3.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758068AbbGGVwo (ORCPT ); Tue, 7 Jul 2015 17:52:44 -0400 X-Greylist: delayed 2103 seconds by postgrey-1.27 at vger.kernel.org; Tue, 07 Jul 2015 17:52:44 EDT From: =?ISO-8859-1?Q?Jo=EBl?= Porquet To: linux-kernel@vger.kernel.org Cc: vgupta@synopsys.com, monstr@monstr.eu, ralf@linux-mips.org, tglx@linutronix.de, jason@lakedaemon.net Subject: [PATCH 4/5] mips:irqchip: prepare for drivers/irqchip/irqchip.h removal Date: Tue, 07 Jul 2015 17:17:33 -0400 Message-ID: <3357968.0IznKtY3Q9@joel-zenbook> User-Agent: KMail/4.14.10 (Linux/4.0.7-2-ARCH; KDE/4.14.10; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" X-Ovh-Tracer-Id: 4750734657366749208 X-Ovh-Remote: 190.181.39.143 (static-190-181-39-143.acelerate.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: 0 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekvddrgedvucetufdoteggucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekvddrgedvucetufdoteggucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2021 Lines: 65 The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'. See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). This patch removes inclusions of private header 'drivers/irqchip/irqchip.h'and replaces them with the inclusion of 'include/linux/irqchip.h'. Signed-off-by: Joel Porquet --- arch/mips/ath79/irq.c | 1 - arch/mips/bmips/irq.c | 2 +- arch/mips/kernel/i8259.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c index afb0096..2021be2 100644 --- a/arch/mips/ath79/irq.c +++ b/arch/mips/ath79/irq.c @@ -17,7 +17,6 @@ #include #include #include -#include "../../../drivers/irqchip/irqchip.h" #include #include diff --git a/arch/mips/bmips/irq.c b/arch/mips/bmips/irq.c index 14552e5..e7fc6f934 100644 --- a/arch/mips/bmips/irq.c +++ b/arch/mips/bmips/irq.c @@ -34,5 +34,5 @@ void __init arch_init_irq(void) irqchip_init(); } -OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller", +IRQCHIP_DECLARE(mips_cpu_intc, "mti,cpu-interrupt-controller", mips_cpu_irq_of_init); diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index 74f6752..a8acee7 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c @@ -18,12 +18,11 @@ #include #include #include +#include #include #include -#include "../../drivers/irqchip/irqchip.h" - /* * This is the 'legacy' 8259A Programmable Interrupt Controller, * present in the majority of PC/AT boxes. -- 2.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/