The patch titled
SM501: only compile suspend/resume if CONFIG_PM
has been removed from the -mm tree. Its filename was
sm501-suspend-support-fix-fix.patch
This patch was dropped because it was folded into sm501-suspend-support.patch
------------------------------------------------------
Subject: SM501: only compile suspend/resume if CONFIG_PM
From: Ben Dooks <ben@xxxxxxxxx>
The suspend and resume support only needs to be built if CONFIG_PM is
defined.
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mfd/sm501.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN drivers/mfd/sm501.c~sm501-suspend-support-fix-fix drivers/mfd/sm501.c
--- a/drivers/mfd/sm501.c~sm501-suspend-support-fix-fix
+++ a/drivers/mfd/sm501.c
@@ -977,6 +977,7 @@ static int sm501_plat_probe(struct platf
}
+#ifdef CONFIG_PM
/* power management support */
static int sm501_plat_suspend(struct platform_device *pdev, pm_message_t state)
@@ -1022,7 +1023,10 @@ static int sm501_plat_resume(struct plat
return 0;
}
-
+#else
+#define sm501_plat_suspend NULL
+#define sm501_plat_resume NULL
+#endif
/* Initialisation data for PCI devices */
_
Patches currently in -mm which might be from ben@xxxxxxxxx are
sm501-suspend-support.patch
sm501-suspend-support-fix-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
