From a7f4236b25f3e54633a7dfc07d05613c647b361f Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Mon, 7 Jan 2013 15:35:06 +0100
Subject: [PATCH] --- yaml --- r: 351125 b: refs/heads/master c:
 70be208f0bd75eb81264f681e36485d0617d612f h: refs/heads/master i:   351123:
 2138b7792b707a0f05e25f255d5c7d56a6f18217 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/mmci.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 834cbe62fcb2..3ec010aa4624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dbb6ee090e810be337945a7a64d647549b70328
+refs/heads/master: 70be208f0bd75eb81264f681e36485d0617d612f
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index fba51073e94f..442b01129626 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/log2.h>
+#include <linux/mmc/pm.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/amba/bus.h>
@@ -1416,6 +1417,9 @@ static int mmci_probe(struct amba_device *dev,
 	mmc->caps = plat->capabilities;
 	mmc->caps2 = plat->capabilities2;
 
+	/* We support these PM capabilities. */
+	mmc->pm_caps = MMC_PM_KEEP_POWER;
+
 	/*
 	 * We can do SGIO
 	 */