From bcc18d4dd5f4fa54e4889cfa8e6119dff88eae3a Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 26 Mar 2013 21:38:52 -0700 Subject: [PATCH] --- yaml --- r: 368083 b: refs/heads/master c: 84c0c9f56ac7ce8036c0a70383dba1789138e859 h: refs/heads/master i: 368081: df822e3be16f6c93b4a31cd2d0781b6e54a7a774 368079: 82a41471f07beb7782f60f53c5fdcca164c46d7a v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/ad714x-i2c.c | 2 +- trunk/drivers/input/misc/ad714x-spi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2da4f73eb21a..b401f9e58f91 100644 --- 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 index 29d2064c26f2..e0f522516ef5 100644 --- a/trunk/drivers/input/misc/ad714x-i2c.c +++ b/trunk/drivers/input/misc/ad714x-i2c.c @@ -13,7 +13,7 @@ #include #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 index bdccca42d138..61891486067c 100644 --- 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)));