From ee913959434ec9c3997e83724f1d966d49f1eeee Mon Sep 17 00:00:00 2001
From: Chuanxiao Dong <chuanxiao.dong@intel.com>
Date: Mon, 23 Apr 2012 15:18:02 +0800
Subject: [PATCH] --- yaml --- r: 307946 b: refs/heads/master c:
 0dd1bfeb6cc89467261cc62ca81e0ac5da78ec0a h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mmc/core/bus.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eb88e4da745d..3d97d06b0e7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b332f9916f33ba0001b78e5cea49ef17f3c81e
+refs/heads/master: 0dd1bfeb6cc89467261cc62ca81e0ac5da78ec0a
diff --git a/trunk/drivers/mmc/core/bus.c b/trunk/drivers/mmc/core/bus.c
index c60cee92a2b2..9b68933f27e7 100644
--- a/trunk/drivers/mmc/core/bus.c
+++ b/trunk/drivers/mmc/core/bus.c
@@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int mmc_bus_suspend(struct device *dev)
 {
 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
@@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev)
 		ret = drv->resume(card);
 	return ret;
 }
+#endif
 
 #ifdef CONFIG_PM_RUNTIME