Fix up a few remaining incorrect CONFIG_GPIO_IRQ

2016-07-22 15:01:00 -06:00 · 2016-07-22 15:01:00 -06:00 · e77872057d
parent 416aa99620
commit e77872057d
3 changed files with 4 additions and 4 deletions
--- 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)
--- a/configs/sam4s-xplained-pro/include/board.h
+++ b/configs/sam4s-xplained-pro/include/board.h
@ -46,7 +46,7 @@

 #ifndef __ASSEMBLY__
 #  include <stdint.h>
-#  ifdef CONFIG_GPIO_IRQ
+#  ifdef CONFIG_SAM34_GPIO_IRQ
 #    include <arch/irq.h>
 #  endif
 #endif
--- a/configs/sam4s-xplained/include/board.h
+++ b/configs/sam4s-xplained/include/board.h
@ -44,7 +44,7 @@

 #ifndef __ASSEMBLY__
 #  include <stdint.h>
-#  ifdef CONFIG_SAM34_SAM34_GPIO_IRQ
+#  ifdef CONFIG_SAM34_GPIO_IRQ
 #    include <arch/irq.h>
 #  endif
 #endif