From a1866828fe13a20855ce5cc722f60adf7d2f055e Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 26 Mar 2013 21:38:47 -0700 Subject: [PATCH] --- yaml --- r: 368082 b: refs/heads/master c: 2b1c0d506d04aa084a88f21600888d99ce469d29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/adxl34x-i2c.c | 2 +- trunk/drivers/input/misc/adxl34x-spi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 06606f6456d1..2da4f73eb21a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38a46eb8cc0faec0345c27083fb26d1e7e02ccff +refs/heads/master: 2b1c0d506d04aa084a88f21600888d99ce469d29 diff --git a/trunk/drivers/input/misc/adxl34x-i2c.c b/trunk/drivers/input/misc/adxl34x-i2c.c index 535dda48cace..416f47ddcc90 100644 --- a/trunk/drivers/input/misc/adxl34x-i2c.c +++ b/trunk/drivers/input/misc/adxl34x-i2c.c @@ -105,7 +105,7 @@ static int adxl34x_i2c_remove(struct i2c_client *client) return adxl34x_remove(ac); } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int adxl34x_i2c_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); diff --git a/trunk/drivers/input/misc/adxl34x-spi.c b/trunk/drivers/input/misc/adxl34x-spi.c index ad5f40d37e48..990b49e712e1 100644 --- a/trunk/drivers/input/misc/adxl34x-spi.c +++ b/trunk/drivers/input/misc/adxl34x-spi.c @@ -94,7 +94,7 @@ static int adxl34x_spi_remove(struct spi_device *spi) return adxl34x_remove(ac); } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int adxl34x_spi_suspend(struct device *dev) { struct spi_device *spi = to_spi_device(dev);