diff --git a/configs/sam3u-ek/src/up_buttons.c b/configs/sam3u-ek/src/up_buttons.c
index f188d396e1..da35ef6437 100644
--- a/configs/sam3u-ek/src/up_buttons.c
+++ b/configs/sam3u-ek/src/up_buttons.c
@@ -108,7 +108,7 @@ static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store)
     {
       /* Detach and disable the interrupt */
 
-      (void)irq_detach(irq)
+      (void)irq_detach(irq);
       sam_gpioirqdisable(irq);
     }
 
diff --git a/configs/sam4e-ek/src/sam_buttons.c b/configs/sam4e-ek/src/sam_buttons.c
index 72ef722a5f..6f9611829a 100644
--- a/configs/sam4e-ek/src/sam_buttons.c
+++ b/configs/sam4e-ek/src/sam_buttons.c
@@ -110,7 +110,7 @@ static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store)
     {
       /* Detach and disable the interrupt */
 
-      (void)irq_detach(irq)
+      (void)irq_detach(irq);
       sam_gpioirqdisable(irq);
     }
 
diff --git a/configs/sam4l-xplained/src/sam_buttons.c b/configs/sam4l-xplained/src/sam_buttons.c
index f0e7459fe4..8a5c015715 100644
--- a/configs/sam4l-xplained/src/sam_buttons.c
+++ b/configs/sam4l-xplained/src/sam_buttons.c
@@ -156,7 +156,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
         {
           /* Detach and disable the interrupt */
 
-          (void)irq_detach(IRQ_SW0)
+          (void)irq_detach(IRQ_SW0);
           sam_gpioirqdisable(IRQ_SW0);
         }
 
diff --git a/configs/sam4s-xplained-pro/src/sam_buttons.c b/configs/sam4s-xplained-pro/src/sam_buttons.c
index 49b983383c..ce2420df21 100644
--- a/configs/sam4s-xplained-pro/src/sam_buttons.c
+++ b/configs/sam4s-xplained-pro/src/sam_buttons.c
@@ -121,7 +121,7 @@ uint8_t board_buttons(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
+#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 {
   xcpt_t oldhandler = NULL;
@@ -155,7 +155,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
         {
           /* Detach and disable the interrupt */
 
-          (void)irq_detach(IRQ_SW0)
+          (void)irq_detach(IRQ_SW0);
           sam_gpioirqdisable(IRQ_SW0);
         }
 
diff --git a/configs/sam4s-xplained/src/sam_buttons.c b/configs/sam4s-xplained/src/sam_buttons.c
index e3c3836aae..86b47fadd5 100644
--- a/configs/sam4s-xplained/src/sam_buttons.c
+++ b/configs/sam4s-xplained/src/sam_buttons.c
@@ -154,7 +154,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
         {
           /* Detach and disable the interrupt */
 
-          (void)irq_detach(IRQ_BP2)
+          (void)irq_detach(IRQ_BP2);
           sam_gpioirqdisable(IRQ_BP2);
         }