| From bd773e951d1faf084acda7b87216c5cf90ee0064 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> |
| Date: Wed, 18 Aug 2010 09:25:38 -0700 |
| Subject: mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| |
| 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> |
| --- |
| drivers/mmc/core/host.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/mmc/core/host.c |
| +++ b/drivers/mmc/core/host.c |
| @@ -85,7 +85,9 @@ struct mmc_host *mmc_alloc_host(int extr |
| 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. |
