[kernel] r16381 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Thu Sep 30 11:32:46 2010
New Revision: 16381

Log:
mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/mmc-build-fix-mmc_pm_notify.patch
   dists/sid/linux-2.6/debian/patches/series/25
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Sep 30 02:21:20 2010	(r16380)
+++ dists/sid/linux-2.6/debian/changelog	Thu Sep 30 11:32:46 2010	(r16381)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-25) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Sep 2010 12:28:58 +0100
+
 linux-2.6 (2.6.32-24) unstable; urgency=high
 
   [ Ben Hutchings ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/mmc-build-fix-mmc_pm_notify.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/mmc-build-fix-mmc_pm_notify.patch	Thu Sep 30 11:32:46 2010	(r16381)
@@ -0,0 +1,32 @@
+From: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
+Date: Wed, 18 Aug 2010 09:25:38 -0700
+Subject: [PATCH] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
+
+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 at pacbell.net>
+Cc: Alan Stern <stern at rowland.harvard.edu>
+Cc: linux-mmc at vger.kernel.org
+Cc: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
+Acked-by: Kukjin Kim <kgene.kim at samsung.com>
+Acked-by: Maxim Levitsky <maximlevitsky at gmail.com>
+Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+[bwh; Adjust context for Debian's 2.6.32]
+---
+--- 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_plus->pm_notify.notifier_call = mmc_pm_notify;
++#endif
+ 
+ 	/*
+ 	 * By default, hosts do not support SGIO or large requests.

Added: dists/sid/linux-2.6/debian/patches/series/25
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/25	Thu Sep 30 11:32:46 2010	(r16381)
@@ -0,0 +1 @@
++ bugfix/all/mmc-build-fix-mmc_pm_notify.patch