---

yaml --- r: 368083 b: refs/heads/master c: 84c0c9f h: refs/heads/master i: 368081: df822e3 368079: 82a4147 v: v3
git-mirror · Mar 27, 2013 · bcc18d4 · bcc18d4
1 parent a186682
commit bcc18d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1c0d506d04aa084a88f21600888d99ce469d29
+refs/heads/master: 84c0c9f56ac7ce8036c0a70383dba1789138e859
diff --git a/trunk/drivers/input/misc/ad714x-i2c.c b/trunk/drivers/input/misc/ad714x-i2c.c
@@ -13,7 +13,7 @@
 #include <linux/pm.h>
 #include "ad714x.h"
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ad714x_i2c_suspend(struct device *dev)
 {
 	return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev)));

diff --git a/trunk/drivers/input/misc/ad714x-spi.c b/trunk/drivers/input/misc/ad714x-spi.c
@@ -16,7 +16,7 @@
 #define AD714x_SPI_CMD_PREFIX      0xE000   /* bits 15:11 */
 #define AD714x_SPI_READ            BIT(10)
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ad714x_spi_suspend(struct device *dev)
 {
 	return ad714x_disable(spi_get_drvdata(to_spi_device(dev)));