diff --git a/[refs] b/[refs] index e4dd1b84bb52..28369b5a03a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ca72feb9343d10a620c3076b0aa6e80d613fcf7 +refs/heads/master: 81ca03a0e2ea0207b2df80e0edcf4c775c07a505 diff --git a/trunk/drivers/mmc/core/host.c b/trunk/drivers/mmc/core/host.c index 0efe631e50ca..d80cfdc8edd2 100644 --- a/trunk/drivers/mmc/core/host.c +++ b/trunk/drivers/mmc/core/host.c @@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) init_waitqueue_head(&host->wq); INIT_DELAYED_WORK(&host->detect, mmc_rescan); INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable); +#ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; +#endif /* * By default, hosts do not support SGIO or large requests.