From 42363d8ea1953790ff8656a534b6e8e697c35a28 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 6 Oct 2011 15:26:51 -0700
Subject: [PATCH] --- yaml --- r: 269493 b: refs/heads/master c:
 26e56eb2bfccdd6bcec0c298d40e12e3daea0188 h: refs/heads/master i:   269491:
 42ebd01014d94b04e1647edfca4d067d46998b5b v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/input/mouse/synaptics_i2c.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 147942a50a93..6ade8a3cfe54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb31f898cc0dac9585f7665945bb50fc442c2109
+refs/heads/master: 26e56eb2bfccdd6bcec0c298d40e12e3daea0188
diff --git a/trunk/drivers/input/mouse/synaptics_i2c.c b/trunk/drivers/input/mouse/synaptics_i2c.c
index e28e9ce0f7eb..4b755cb5b38c 100644
--- a/trunk/drivers/input/mouse/synaptics_i2c.c
+++ b/trunk/drivers/input/mouse/synaptics_i2c.c
@@ -619,7 +619,7 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int synaptics_i2c_suspend(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);