[PATCH] mmc: fix for CONFIG_PM disabled

[PATCH] mmc: fix for CONFIG_PM disabled

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Minimal patch to fix mmc to build when CONFIG_PM is not enabled:

(.text+0x128fcd): undefined reference to `mmc_pm_notify'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/mmc/core/host.c |    2 ++
 1 file changed, 2 insertions(+)

Seems to be needed in mainline also.

--- mmotm-2010-0811-1610.orig/drivers/mmc/core/host.c
+++ mmotm-2010-0811-1610/drivers/mmc/core/host.c
@@ -86,7 +86,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.

Re: [PATCH] mmc: fix for CONFIG_PM disabled

[Uwe Kleine-König]

On Thu, Aug 12, 2010 at 09:36:43AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Minimal patch to fix mmc to build when CONFIG_PM is not enabled:
> 
> (.text+0x128fcd): undefined reference to `mmc_pm_notify'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

I sent the same patch[1] a few hours later than Randy, mine got

	Acked-by: Kukjin Kim <kgene.kim@samsung.com>
	Acked-by: Maxim Levitsky <maximlevitsky@gmail.com>

.  I think it's fine to add these to Randy's patch, too, together with
my Ack.  Maybe add a reference to the breaking commit as my patch did?
	
Thanks
Uwe

[1] http://mid.gmane.org/1281691473-15481-1-git-send-email-u.kleine-koenig@pengutronix.de

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |