Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756562AbbGaVwJ (ORCPT ); Fri, 31 Jul 2015 17:52:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36345 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755844AbbGaVwG (ORCPT ); Fri, 31 Jul 2015 17:52:06 -0400 Date: Fri, 31 Jul 2015 14:51:54 -0700 From: tip-bot for Joel Porquet Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, joel@porquet.org, linux-kernel@vger.kernel.org Reply-To: joel@porquet.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <3357968.0IznKtY3Q9@joel-zenbook> References: <3357968.0IznKtY3Q9@joel-zenbook> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mips/irq: prepare for drivers/irqchip/ irqchip.h removal Git-Commit-ID: 0a271c2a34deb98a81f94fc87380287f3a8c9c72 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2588 Lines: 76 Commit-ID: 0a271c2a34deb98a81f94fc87380287f3a8c9c72 Gitweb: http://git.kernel.org/tip/0a271c2a34deb98a81f94fc87380287f3a8c9c72 Author: Joel Porquet AuthorDate: Tue, 7 Jul 2015 17:17:33 -0400 Committer: Thomas Gleixner CommitDate: Fri, 31 Jul 2015 20:51:21 +0200 mips/irq: prepare for drivers/irqchip/irqchip.h removal 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 Cc: vgupta@synopsys.com Cc: monstr@monstr.eu Cc: ralf@linux-mips.org Cc: jason@lakedaemon.net Link: http://lkml.kernel.org/r/3357968.0IznKtY3Q9@joel-zenbook Signed-off-by: Thomas Gleixner --- 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. -- 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/