Date:2010-07-13 03:19:10 (13 years 8 months ago)
Author:Lars C.
Commit:d2d5cee8bdfaeb54e2267747b264813d55ddb141
Message:MMC: jz4740: fix merge error

Files: drivers/mmc/host/jz4740_mmc.c (1 diff)

Change Details

drivers/mmc/host/jz4740_mmc.c
897897    jz4740_mmc_clock_disable(host);
898898    setup_timer(&host->timeout_timer, jz4740_mmc_timeout,
899899            (unsigned long)host);
900    /* It is not important when it times out, it just needs to timeout. */
901    set_timer_slack(&host->timeout_timer, HZ);
902900
903901    platform_set_drvdata(pdev, host);
904902    ret = mmc_add_host(mmc);

Archive Download the corresponding diff file



interactive