From patchwork Sat Sep 18 19:13:01 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Greg Kroah-Hartman <gregkh@suse.de>
X-Patchwork-Id: 191422
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8IJPp5W025365
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Sat, 18 Sep 2010 19:25:52 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757055Ab0IRTZ2 (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Sat, 18 Sep 2010 15:25:28 -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 <rfc822;linux-mmc@vger.kernel.org>);
	Sat, 18 Sep 2010 15:15:47 -0400
Received: from localhost (c-24-16-163-131.hsd1.wa.comcast.net
	[24.16.163.131])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by coco.kroah.org (Postfix) with ESMTPSA id 957A148CC5;
	Sat, 18 Sep 2010 12:15:46 -0700 (PDT)
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 <gregkh@suse.de>
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 <david-b@pacbell.net>,
	Alan Stern <stern@rowland.harvard.edu>, linux-mmc@vger.kernel.org,
	=?ISO-8859-15?q?Uwe=20Kleine-K=C3=B6nig?=
	<u.kleine-koenig@pengutronix.de>, Kukjin Kim <kgene.kim@samsung.com>,
	Maxim Levitsky <maximlevitsky@gmail.com>,
	Randy Dunlap <randy.dunlap@oracle.com>
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-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Sat, 18 Sep 2010 19:25:52 +0000 (UTC)


--- 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.