From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: [083/129] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y Date: Sat, 18 Sep 2010 12:13:01 -0700 Message-ID: <20100918191304.455467177@clark.site> References: <20100918191317.GA11386@kroah.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20100918191317.GA11386@kroah.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, David Brownell , Alan Stern , linux-mmc@vger.kernel.org, =?ISO-8859-15?q?Uwe=20Kleine-K=C3=B6nig?= , Kukjin Kim , Maxim Levitsky , Randy Dunlap List-Id: linux-mmc@vger.kernel.org 2.6.35-stable review patch. If anyone has any objections, please let u= s know. ------------------ =46rom: Uwe Kleine-K=C3=B6nig commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505 upstream. This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fi= x all hangs related to mmc/sd card insert/removal during suspend/resume") Cc: David Brownell Cc: Alan Stern Cc: linux-mmc@vger.kernel.org Cc: Andrew Morton Signed-off-by: Uwe Kleine-K=C3=B6nig Acked-by: Kukjin Kim Acked-by: Maxim Levitsky Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/host.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/mmc/core/host.c +++ b/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 =3D mmc_pm_notify; +#endif =20 /* * By default, hosts do not support SGIO or large requests. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757137Ab0IRTZ3 (ORCPT ); Sat, 18 Sep 2010 15:25:29 -0400 Received: from kroah.org ([198.145.64.141]:43662 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756845Ab0IRTPr (ORCPT ); Sat, 18 Sep 2010 15:15:47 -0400 X-Mailbox-Line: From gregkh@clark.site Sat Sep 18 12:13:04 2010 Message-Id: <20100918191304.455467177@clark.site> User-Agent: quilt/0.48-11.2 Date: Sat, 18 Sep 2010 12:13:01 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, David Brownell , Alan Stern , linux-mmc@vger.kernel.org, =?ISO-8859-15?q?Uwe=20Kleine-K=C3=B6nig?= , Kukjin Kim , Maxim Levitsky , Randy Dunlap Subject: [083/129] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y In-Reply-To: <20100918191317.GA11386@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.35-stable review patch. If anyone has any objections, please let us know. ------------------ From: Uwe Kleine-König 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 Cc: Alan Stern Cc: linux-mmc@vger.kernel.org Cc: Andrew Morton Signed-off-by: Uwe Kleine-König Acked-by: Kukjin Kim Acked-by: Maxim Levitsky Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/host.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/mmc/core/host.c +++ b/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.