[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110506002215.733039547@clark.kroah.org>
Date: Thu, 05 May 2011 17:21:32 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
David Brownell <david-b@...bell.net>,
Alan Stern <stern@...land.harvard.edu>,
linux-mmc@...r.kernel.org,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>,
Kukjin Kim <kgene.kim@...sung.com>,
Maxim Levitsky <maximlevitsky@...il.com>,
Randy Dunlap <randy.dunlap@...cle.com>
Subject: [107/143] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Uwe Kleine-König <u.kleine-koenig@...gutronix.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@...bell.net>
Cc: Alan Stern <stern@...land.harvard.edu>
Cc: linux-mmc@...r.kernel.org
Cc: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Acked-by: Kukjin Kim <kgene.kim@...sung.com>
Acked-by: Maxim Levitsky <maximlevitsky@...il.com>
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists