2.6.32-longterm review patch.  If anyone has any objections, please let us know.

------------------

From: Uwe Kleine-König <u.kleine-koe...@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 <davi...@pacbell.net>
Cc: Alan Stern <st...@rowland.harvard.edu>
Cc: linux-mmc@vger.kernel.org
Cc: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
Acked-by: Kukjin Kim <kgene....@samsung.com>
Acked-by: Maxim Levitsky <maximlevit...@gmail.com>
Acked-by: Randy Dunlap <randy.dun...@oracle.com>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@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.


--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to