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 | ||
---|---|---|
897 | 897 | jz4740_mmc_clock_disable(host); |
898 | 898 | setup_timer(&host->timeout_timer, jz4740_mmc_timeout, |
899 | 899 | (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); | |
902 | 900 | |
903 | 901 | platform_set_drvdata(pdev, host); |
904 | 902 | ret = mmc_add_host(mmc); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9