diff --git a/[refs] b/[refs] index bbb0178db1ac..8e8da99b7965 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ff6471c028a9885e8f09a000d87694f81190ab9 +refs/heads/master: ce252edd869ba1fee6a9a6f83e20f349d4c4d669 diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c index d1e4b0849e39..07c03cb677b6 100644 --- a/trunk/drivers/mmc/core/core.c +++ b/trunk/drivers/mmc/core/core.c @@ -121,7 +121,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) "tsac %d ms nsac %d\n", mmc_hostname(host), mrq->data->blksz, mrq->data->blocks, mrq->data->flags, - mrq->data->timeout_ns / 10000000, + mrq->data->timeout_ns / 1000000, mrq->data->timeout_clks); }