1 files changed, 22 insertions, 16 deletions

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 24e09454e522..57e00cffb26b 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1057,22 +1057,6 @@ msmsdcc_init_dma(struct msmsdcc_host *host)
         return 0;
 }
 
-#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
-static void
-do_resume_work(struct work_struct *work)
-{
-        struct msmsdcc_host *host =
-                container_of(work, struct msmsdcc_host, resume_task);
-        struct mmc_host *mmc = host->mmc;
-
-        if (mmc) {
-                mmc_resume_host(mmc);
-                if (host->stat_irq)
-                        enable_irq(host->stat_irq);
-        }
-}
-#endif
-
 static int
 msmsdcc_probe(struct platform_device *pdev)
 {
@@ -1314,6 +1298,24 @@ msmsdcc_probe(struct platform_device *pdev)
         return ret;
 }
 
+#ifdef CONFIG_PM
+#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
+static void
+do_resume_work(struct work_struct *work)
+{
+        struct msmsdcc_host *host =
+                container_of(work, struct msmsdcc_host, resume_task);
+        struct mmc_host *mmc = host->mmc;
+
+        if (mmc) {
+                mmc_resume_host(mmc);
+                if (host->stat_irq)
+                        enable_irq(host->stat_irq);
+        }
+}
+#endif
+
+
 static int
 msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
 {
@@ -1358,6 +1360,10 @@ msmsdcc_resume(struct platform_device *dev)
         }
         return 0;
 }
+#else
+#define msmsdcc_suspend 0
+#define msmsdcc_resume 0
+#endif
 
 static struct platform_driver msmsdcc_driver = {
         .probe          = msmsdcc_probe,