---

yaml --- r: 307946 b: refs/heads/master c: 0dd1bfe h: refs/heads/master v: v3
git-mirror · Apr 23, 2012 · ee91395 · ee91395
1 parent 6996d4e
commit ee91395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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