diff options
author | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:05:47 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:05:47 +0100 |
commit | 6d7ba2cef52d6daf119269f06c471c8882e59b84 (patch) | |
tree | 94251571a5c2f6fdff10968ad6d76a2eb3ecc763 /drivers/mmc/pxa_mmc_gen.c | |
parent | d0b8feef8b50335a58ffde7df3e6748adfaa7025 (diff) | |
parent | 8eee2bd7f484c4933c4e3112c3c3db886ac945ca (diff) |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
fsl_esdhc: fix PIO mode transfers
mmc: tegra2: Implement card-detect hook.
mmc: fsl_esdhc: Implement card-detect hook.
mmc: Implement card detection.
mmc: Change board_mmc_getcd() function prototype.
drivers/mmc/mv_sdhci.c: Fix build warning
ftsdc010: improve performance and capability
mmc: add host_caps checking avoid switch card improperly
i.mx: fsl_esdhc: add the i.mx6q support
Diffstat (limited to 'drivers/mmc/pxa_mmc_gen.c')
-rw-r--r-- | drivers/mmc/pxa_mmc_gen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 4a7c67a6bd..2c5bf17bb3 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -411,6 +411,7 @@ int pxa_mmc_register(int card_index) mmc->send_cmd = pxa_mmc_request; mmc->set_ios = pxa_mmc_set_ios; mmc->init = pxa_mmc_init; + mmc->getcd = NULL; mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; mmc->f_max = PXAMMC_MAX_SPEED; |