---

yaml --- r: 332823 b: refs/heads/master c: d8e2ac3 h: refs/heads/master i: 332821: a8eb120 332819: aa954af 332815: e3e63f3 v: v3
git-mirror · Sep 19, 2012 · 1571fda · 1571fda
1 parent 72e4a93
commit 1571fda
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a41313e7f8c5b724a2e3ff66558dbe811844423
+refs/heads/master: d8e2ac330f65bcf47e8894fe5331a7e8ee019c06
diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c
@@ -193,14 +193,7 @@ static int sdio_bus_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-
-static int pm_no_operation(struct device *dev)
-{
-	return 0;
-}
-
 static const struct dev_pm_ops sdio_bus_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation)
 	SET_RUNTIME_PM_OPS(
 		pm_generic_runtime_suspend,
 		pm_generic_runtime_resume,