Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761419Ab0HMJYq (ORCPT ); Fri, 13 Aug 2010 05:24:46 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:51925 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761390Ab0HMJYo (ORCPT ); Fri, 13 Aug 2010 05:24:44 -0400 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-kernel@vger.kernel.org Cc: Maxim Levitsky , David Brownell , Alan Stern , linux-mmc@vger.kernel.org, Andrew Morton Subject: [PATCH] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y Date: Fri, 13 Aug 2010 11:24:33 +0200 Message-Id: <1281691473-15481-1-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1276809814-28683-1-git-send-email-maximlevitsky@gmail.com> References: <1276809814-28683-1-git-send-email-maximlevitsky@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1284 Lines: 36 This fixes a build breakage introduced by 4c2ef25 (mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume) Cc: Maxim Levitsky Cc: David Brownell Cc: Alan Stern Cc: linux-mmc@vger.kernel.org Cc: Andrew Morton Signed-off-by: Uwe Kleine-König --- 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 0efe631..d80cfdc 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -86,7 +86,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. -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/