diff options
author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-15 11:42:48 +0800 |
---|---|---|
committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-15 11:42:48 +0800 |
commit | 535d88527a3d4d7e0ac7da8aee1fdd0f8df599e4 (patch) | |
tree | 681563b0ce9ccd1dc9c139d64e4c76168b633922 /drivers/mmc | |
parent | 04f9dc854fa70f1ea066f51218663568bea19d67 (diff) | |
parent | 464e5eb0311c9c9ae2efc1d11efa4f476b913513 (diff) |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'drivers/mmc')
-rwxr-xr-x | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 36e56709e25f..d1fe3d3f73ab 100755 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -30,7 +30,7 @@ #include "sdhci.h" #define DRIVER_NAME "sdhci" -#define CLK_TIMEOUT (10 * HZ) +#define CLK_TIMEOUT (1 * HZ) #define DBG(f, x...) \ pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x) |