diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-18 09:25:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-09 15:55:32 -0700 |
| commit | ed9de8cc020e04c55c0952ce8040b6f1f1d2fab1 (patch) | |
| tree | 163a2c73b197d8c207ae4362ecaa34e4b5f716ff /drivers/mmc | |
| parent | 28e4bf4a8b80ccae1e42f9ca2d173f1cf5f60abb (diff) | |
mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505 upstream.
This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix
all hangs related to mmc/sd card insert/removal during suspend/resume")
Cc: David Brownell <david-b@pacbell.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: linux-mmc@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/host.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index b88fc3d50b8..bc875cda66f 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -85,7 +85,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. |