diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 2f33265e331..6f0c71a3ec5 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -379,8 +379,13 @@ struct kinetis_dev_s g_sdhcdev =
     .callbackenable   = kinetis_callbackenable,
     .registercallback = kinetis_registercallback,
 #ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_KINETIS_SDHC_DMA
     .dmarecvsetup     = kinetis_dmarecvsetup,
     .dmasendsetup     = kinetis_dmasendsetup,
+#else
+    .dmarecvsetup     = kinetis_recvsetup,
+    .dmasendsetup     = kinetis_sendsetup,
+#endif
 #endif
   },
 };
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index f6f7993c19c..adf268f9d47 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -444,8 +444,13 @@ struct lpc17_dev_s g_scard_dev =
     .callbackenable   = lpc17_callbackenable,
     .registercallback = lpc17_registercallback,
 #ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_LPC17_SDCARD_DMA
     .dmarecvsetup     = lpc17_dmarecvsetup,
     .dmasendsetup     = lpc17_dmasendsetup,
+#else
+    .dmarecvsetup     = lpc17_recvsetup,
+    .dmasendsetup     = lpc17_sendsetup,
+#endif
 #endif
   },
 };
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 902b85214af..3fe5a7dbff3 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -78,14 +78,14 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_SAMA5_HSMCI_DMA
+#ifndef CONFIG_SAMV7_HSMCI_DMA
 #  warning "Large Non-DMA transfer may result in RX overrun failures"
 #else
 #  ifndef CONFIG_SAMV7_XDMAC
-#    error "CONFIG_SAMA5_HSMCI_DMA support requires CONFIG_SAMV7_XDMAC"
+#    error "CONFIG_SAMV7_HSMCI_DMA support requires CONFIG_SAMV7_XDMAC"
 #  endif
 #  ifndef CONFIG_SDIO_DMA
-#    error CONFIG_SDIO_DMA must be defined with CONFIG_SAMA5_HSMCI_DMA
+#    error CONFIG_SDIO_DMA must be defined with CONFIG_SAMV7_HSMCI_DMA
 #  endif
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index dbfbc7d4d8b..68ca6122c81 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -525,11 +525,19 @@ struct stm32_dev_s g_sdiodev =
     .callbackenable   = stm32_callbackenable,
     .registercallback = stm32_registercallback,
 #ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32_SDIO_DMA
 #ifdef CONFIG_SDIO_PREFLIGHT
     .dmapreflight     = stm32_dmapreflight,
 #endif
     .dmarecvsetup     = stm32_dmarecvsetup,
     .dmasendsetup     = stm32_dmasendsetup,
+#else
+#ifdef CONFIG_SDIO_PREFLIGHT
+    .dmapreflight     = NULL,
+#endif
+    .dmarecvsetup     = stm32_recvsetup,
+    .dmasendsetup     = stm32_sendsetup,
+#endif
 #endif
   },
 };
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index 49365090014..376f67ce2d3 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -592,11 +592,19 @@ struct stm32_dev_s g_sdmmcdev1 =
     .callbackenable   = stm32_callbackenable,
     .registercallback = stm32_registercallback,
 #ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32F7_SDMMC_DMA
 #ifdef CONFIG_SDIO_PREFLIGHT
     .dmapreflight     = stm32_dmapreflight,
 #endif
     .dmarecvsetup     = stm32_dmarecvsetup,
     .dmasendsetup     = stm32_dmasendsetup,
+#else
+#ifdef CONFIG_SDIO_PREFLIGHT
+    .dmapreflight     = NULL,
+#endif
+    .dmarecvsetup     = stm32_recvsetup,
+    .dmasendsetup     = stm32_sendsetup,
+#endif
 #endif
   },
   .base              = STM32_SDMMC1_BASE,