diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index 154c52c1d4..3cd32518d1 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -113,7 +113,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
    * interrupt handler.
    */
 
-  regs         = current_regs;
+  regs         = (uint32_t *)current_regs;
   current_regs = NULL;
 
   /* Unmask the last interrupt (global interrupts are still disabled) */
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index ffa5269e3c..14ebc357e7 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -754,32 +754,6 @@ config SAM34_EXTSRAM1HEAP
 endif # SAM34_EXTSRAM1
 endmenu # External Memory Configuration
 
-comment "AT91SAM3/4 USART Configuration"
-
-config USART0_ISUART
-	bool "USART0 is a UART"
-	default y
-	depends on SAM34_USART0
-	select ARCH_HAVE_USART0
-
-config USART1_ISUART
-	bool "USART1 is a UART"
-	default y
-	depends on SAM34_USART1
-	select ARCH_HAVE_USART1
-
-config USART2_ISUART
-	bool "USART2 is a UART"
-	default n
-	depends on SAM34_USART2
-	select ARCH_HAVE_USART2
-
-config USART3_ISUART
-	bool "USART3 is a UART"
-	default y
-	depends on SAM34_USART3
-	select ARCH_HAVE_USART2
-
 comment "AT91SAM3/4 GPIO Interrupt Configuration"
 
 config GPIO_IRQ