From 97b3736337d06b64e6fe3dc338138551020d6a83 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 2 Jul 2012 16:53:52 +0800
Subject: [PATCH] --- yaml --- r: 319714 b: refs/heads/master c:
 938848e7a5550ce28036ab30e2900b4672a540ee h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mfd/adp5520.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a36f738d8c38..67692df83d17 100644
--- 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
index 8d816cce8322..ea8b9475731d 100644
--- 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);