From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Fri, 13 Jan 2012 16:34:10 +0000 Subject: [RFC PATCH 09/10] ARM: only include mach/irqs.h for !SPARSE_IRQ Message-Id: <1326472451-9002-10-git-send-email-robherring2@gmail.com> List-Id: References: <1326472451-9002-1-git-send-email-robherring2@gmail.com> In-Reply-To: <1326472451-9002-1-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org From: Rob Herring Make mach/irqs.h optional for SPARSE_IRQ. With this change irqs.h can be removed by converting platforms over to sparse irq. This intentionally breaks platforms that enable SPARSE_IRQ. Signed-off-by: Rob Herring --- arch/arm/include/asm/irq.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 5a526af..35c21c3 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -1,14 +1,18 @@ #ifndef __ASM_ARM_IRQ_H #define __ASM_ARM_IRQ_H +#define NR_IRQS_LEGACY 16 + +#ifndef CONFIG_SPARSE_IRQ #include +#else +#define NR_IRQS NR_IRQS_LEGACY +#endif #ifndef irq_canonicalize #define irq_canonicalize(i) (i) #endif -#define NR_IRQS_LEGACY 16 - /* * Use this value to indicate lack of interrupt * capability -- 1.7.5.4