diff --git a/[refs] b/[refs] index 3b832bf19f3e..9394a609028b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29495aa04a30c21565243c5b9c028510446d242c +refs/heads/master: 5c7f0e083d2d98ba14ddd10e88f001a0ead4cae4 diff --git a/trunk/drivers/mmc/core/host.c b/trunk/drivers/mmc/core/host.c index e8a5eb38748b..d31c78b72b0f 100644 --- a/trunk/drivers/mmc/core/host.c +++ b/trunk/drivers/mmc/core/host.c @@ -302,17 +302,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) host->max_blk_size = 512; host->max_blk_count = PAGE_CACHE_SIZE / 512; - /* - * Enable runtime power management by default. This flag was added due - * to runtime power management causing disruption for some users, but - * the power on/off code has been improved since then. - * - * We'll enable this flag by default as an experiment, and if no - * problems are reported, we will follow up later and remove the flag - * altogether. - */ - host->caps = MMC_CAP_POWER_OFF_CARD; - return host; free: