From 64d290182184a4f705883c1f509fadab45ea4576 Mon Sep 17 00:00:00 2001
From: Kevin Liu <kliu5@marvell.com>
Date: Mon, 14 Jan 2013 14:38:53 -0500
Subject: [PATCH] --- yaml --- r: 359893 b: refs/heads/master c:
 9ddc4f27cf9ebb413c713fb4419c4f5e80c6a5f3 h: refs/heads/master i:   359891:
 36dc9ad92498acf8e6e91eb0c5b148b2028d6676 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mmc/host/sdhci-pxav3.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2948c7fb2a4e..d8db0d5f5c6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8678b8181dacb1804325f70e63a176873ce9784f
+refs/heads/master: 9ddc4f27cf9ebb413c713fb4419c4f5e80c6a5f3
diff --git a/trunk/drivers/mmc/host/sdhci-pxav3.c b/trunk/drivers/mmc/host/sdhci-pxav3.c
index b7ee7761bc26..3d20c10fc571 100644
--- a/trunk/drivers/mmc/host/sdhci-pxav3.c
+++ b/trunk/drivers/mmc/host/sdhci-pxav3.c
@@ -311,6 +311,13 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, host);
 
+	if (pdata->pm_caps & MMC_PM_KEEP_POWER) {
+		device_init_wakeup(&pdev->dev, 1);
+		host->mmc->pm_flags |= MMC_PM_WAKE_SDIO_IRQ;
+	} else {
+		device_init_wakeup(&pdev->dev, 0);
+	}
+
 	return 0;
 
 err_add_host: