diff --git a/[refs] b/[refs]
index aa36edc264d9..2b6385fae381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 613c25e7b5d4129d64327f83c00ad1463b606b01
+refs/heads/master: 93c3a791e7ce306f33b8e39d96ae9527c23e925a
diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c
index 6d4328dce320..6d3644430877 100644
--- a/trunk/drivers/mmc/host/sh_mmcif.c
+++ b/trunk/drivers/mmc/host/sh_mmcif.c
@@ -1348,7 +1348,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 	host		= mmc_priv(mmc);
 	host->mmc	= mmc;
 	host->addr	= reg;
-	host->timeout	= 1000;
+	host->timeout	= msecs_to_jiffies(1000);
 
 	host->pd = pdev;