diff --git a/board/boundary/eo/eo.c b/board/boundary/eo/eo.c
index ff95a80cffd7d20457c3e16e2e54f7dbdbf4179a..2147cbfefb8977c9514d5f712d45c92f2b39d5b6 100644
--- a/board/boundary/eo/eo.c
+++ b/board/boundary/eo/eo.c
@@ -21,7 +21,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/spi.h>
 #include <mmc.h>
-#include <fsl_esdhc.h>
+#include <fsl_esdhc_imx.h>
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
 #include <asm/arch/crm_regs.h>
@@ -220,7 +220,7 @@ int board_ehci_power(int port, int on)
 
 #endif
 
-#ifdef CONFIG_FSL_ESDHC
+#ifdef CONFIG_FSL_ESDHC_IMX
 struct fsl_esdhc_cfg board_usdhc_cfg[] = {
 	{.esdhc_base = USDHC3_BASE_ADDR, .bus_width = 4,
 			.gp_cd = GP_USDHC3_CD},
diff --git a/configs/eo_defconfig b/configs/eo_defconfig
index bacdd6d47dbab9ccccb809158e47c565042ef859..5cff9cb1744b3b4d9669159b864aebdc4fb1bffc 100644
--- a/configs/eo_defconfig
+++ b/configs/eo_defconfig
@@ -42,7 +42,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FASTBOOT_BUF_SIZE=0x26000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
-CONFIG_FSL_ESDHC=y
+CONFIG_FSL_ESDHC_IMX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_SPANSION=y
diff --git a/configs/eo_duallite_defconfig b/configs/eo_duallite_defconfig
index 163b0e79a6db5bdc322f263b4c5c2b514c1a10d7..eced7a1fa4121f51a84df26d66f7f80d246ca757 100644
--- a/configs/eo_duallite_defconfig
+++ b/configs/eo_duallite_defconfig
@@ -42,7 +42,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FASTBOOT_BUF_SIZE=0x26000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
-CONFIG_FSL_ESDHC=y
+CONFIG_FSL_ESDHC_IMX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_SPANSION=y