2015-07-07 21:23:08

by Joel Porquet

[permalink] [raw]
Subject: [PATCH 2/5] microblaze:irqchip: 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 the inclusion of private header 'drivers/irqchip/irqchip.h'
and replaces it with the inclusion of 'include/linux/irqchip.h'.

Signed-off-by: Joel Porquet <[email protected]>
---
arch/microblaze/kernel/intc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 719feee..90bec7d 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -11,12 +11,11 @@

#include <linux/irqdomain.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/io.h>
#include <linux/bug.h>

-#include "../../drivers/irqchip/irqchip.h"
-
static void __iomem *intc_baseaddr;

/* No one else should require these constants, so define them locally here. */
--
2.4.5


Subject: [tip:irq/core] microblaze/irq: prepare for drivers/irqchip/ irqchip.h removal

Commit-ID: fd4b267b3d30f4742bdf7586fed5193b67938e32
Gitweb: http://git.kernel.org/tip/fd4b267b3d30f4742bdf7586fed5193b67938e32
Author: Joel Porquet <[email protected]>
AuthorDate: Tue, 7 Jul 2015 17:13:15 -0400
Committer: Thomas Gleixner <[email protected]>
CommitDate: Fri, 31 Jul 2015 20:51:21 +0200

microblaze/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 the inclusion of private header 'drivers/irqchip/irqchip.h'
and replaces it with the inclusion of 'include/linux/irqchip.h'.

Signed-off-by: Joel Porquet <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/12384045.pHnZrl3CFY@joel-zenbook
Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/microblaze/kernel/intc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 719feee..90bec7d 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -11,12 +11,11 @@

#include <linux/irqdomain.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/io.h>
#include <linux/bug.h>

-#include "../../drivers/irqchip/irqchip.h"
-
static void __iomem *intc_baseaddr;

/* No one else should require these constants, so define them locally here. */