From 99231d5ddd80e0239aef92b7ff568f332bf06538 Mon Sep 17 00:00:00 2001 From: xbw Date: Sun, 17 Jul 2011 22:58:43 -0700 Subject: [PATCH] modify rk29_sdk_defconfig for SDMMC --- arch/arm/configs/rk29_sdk_defconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index c898c3871f73..de7ac0cdbd65 100755 --- a/arch/arm/configs/rk29_sdk_defconfig +++ b/arch/arm/configs/rk29_sdk_defconfig @@ -1760,14 +1760,13 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y -# CONFIG_MMC_PARANOID_SD_INIT is not set - +CONFIG_MMC_PARANOID_SD_INIT=y # # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set @@ -1779,8 +1778,8 @@ CONFIG_SDMMC_RK29=y # # Now, there are two SDMMC controllers selected, SDMMC0 and SDMMC1. # +# CONFIG_SDMMC_RK29_OLD is not set CONFIG_SDMMC0_RK29=y -# CONFIG_EMMC_RK29 is not set CONFIG_SDMMC1_RK29=y # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_AT91 is not set -- 2.34.1