diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:51 +0200 |
| commit | 54f54496779661678d906b57e4cba48239ab7c9b (patch) | |
| tree | feb06330bfa37391a5502e8dc6dfdd58b46b56fb /drivers/mmc | |
| parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff) | |
| parent | 1d661bf5327a2c059ec967f850e89362e637f4e6 (diff) | |
| download | blackbird-op-linux-54f54496779661678d906b57e4cba48239ab7c9b.tar.gz blackbird-op-linux-54f54496779661678d906b57e4cba48239ab7c9b.zip | |
Merge branch 'timers/core' into smp/hotplug to pick up dependencies
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/jz4740_mmc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 03ddf0ecf402..684087db170b 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -1068,8 +1068,6 @@ static int jz4740_mmc_probe(struct platform_device* pdev) jz4740_mmc_clock_disable(host); setup_timer(&host->timeout_timer, jz4740_mmc_timeout, (unsigned long)host); - /* It is not important when it times out, it just needs to timeout. */ - set_timer_slack(&host->timeout_timer, HZ); host->use_dma = true; if (host->use_dma && jz4740_mmc_acquire_dma_channels(host) != 0) |
