From e77872057dfdfae15085a6c1ae4547acefc9ca46 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 22 Jul 2016 15:01:00 -0600 Subject: [PATCH] Fix up a few remaining incorrect CONFIG_GPIO_IRQ --- arch/hc/include/m9s12/irq.h | 4 ++-- configs/sam4s-xplained-pro/include/board.h | 2 +- configs/sam4s-xplained/include/board.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/hc/include/m9s12/irq.h b/arch/hc/include/m9s12/irq.h index 63ab556b8e..d70e40de34 100644 --- a/arch/hc/include/m9s12/irq.h +++ b/arch/hc/include/m9s12/irq.h @@ -108,7 +108,7 @@ * Port J: Pins 0-3 and 6-7 */ -#ifdef CONFIG_GPIO_IRQ +#ifdef CONFIG_HCS12_GPIOIRQ /* To conserve space, interrupts must also be configured, port by port */ @@ -156,7 +156,7 @@ # endif #else # define HCS12_IRQ_NIRQS HCS12_IRQ_NVECTORS -#endif /* CONFIG_GPIO_IRQ */ +#endif /* CONFIG_HCS12_GPIOIRQ */ #define HCS12_IRQ_VILLEGAL HCS12_IRQ_NIRQS /* Any reserved vector */ #define NR_IRQS (HCS12_IRQ_NIRQS+1) diff --git a/configs/sam4s-xplained-pro/include/board.h b/configs/sam4s-xplained-pro/include/board.h index 58380480a9..0ef923c7e3 100644 --- a/configs/sam4s-xplained-pro/include/board.h +++ b/configs/sam4s-xplained-pro/include/board.h @@ -46,7 +46,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/sam4s-xplained/include/board.h b/configs/sam4s-xplained/include/board.h index e3fdda9890..3457a08bd7 100644 --- a/configs/sam4s-xplained/include/board.h +++ b/configs/sam4s-xplained/include/board.h @@ -44,7 +44,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_SAM34_SAM34_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif