diff --git a/configs/samv71-xult/src/sam_buttons.c b/configs/samv71-xult/src/sam_buttons.c
index b3836de2782..63df27e04f1 100644
--- a/configs/samv71-xult/src/sam_buttons.c
+++ b/configs/samv71-xult/src/sam_buttons.c
@@ -63,12 +63,13 @@
  * Private Data
  ****************************************************************************/
 
+#ifdef CONFIG_ARCH_IRQBUTTONS
+
 #define HAVE_IRQBUTTONS 1
-#if !defined(CONFIG_SAMV7_GPIO1_IRQ) && !defined(CONFIG_SAMV7_GPIOB_IRQ)
+#if !defined(CONFIG_SAMV7_GPIOA_IRQ) && !defined(CONFIG_SAMV7_GPIOB_IRQ)
 #  undef HAVE_IRQBUTTONS
 #endif
 
-#ifdef CONFIG_ARCH_IRQBUTTONS
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
 static xcpt_t g_irq_sw0;
 #endif