From 4809503ce2853652ae175c6666b37f8c635d3d2b Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 26 Mar 2013 16:05:58 +0900 Subject: [PATCH] --- yaml --- r: 363168 b: refs/heads/master c: 39d791649781f6bb6937a217764a928b660375e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/apds990x.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 968f0e5f2b03..a1c1da01230f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ca19d6f5feb57dcd5645c0761282e1b9fc3afcb +refs/heads/master: 39d791649781f6bb6937a217764a928b660375e2 diff --git a/trunk/drivers/misc/apds990x.c b/trunk/drivers/misc/apds990x.c index 1efb6a4ea397..98f9bb26492a 100644 --- a/trunk/drivers/misc/apds990x.c +++ b/trunk/drivers/misc/apds990x.c @@ -1201,7 +1201,7 @@ static int apds990x_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int apds990x_suspend(struct device *dev) { struct i2c_client *client = container_of(dev, struct i2c_client, dev); @@ -1224,10 +1224,6 @@ static int apds990x_resume(struct device *dev) return 0; } -#else -#define apds990x_suspend NULL -#define apds990x_resume NULL -#define apds990x_shutdown NULL #endif #ifdef CONFIG_PM_RUNTIME