---

yaml --- r: 319714 b: refs/heads/master c: 938848e h: refs/heads/master v: v3
git-mirror · Jul 8, 2012 · 97b3736 · 97b3736
1 parent 750c18b
commit 97b3736
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e03088972f6e38e90077eaf09acf7b8a327a2da2
+refs/heads/master: 938848e7a5550ce28036ab30e2900b4672a540ee
diff --git a/trunk/drivers/mfd/adp5520.c b/trunk/drivers/mfd/adp5520.c
@@ -320,7 +320,7 @@ static int __devexit adp5520_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int adp5520_suspend(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);