diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-09 14:37:17 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 08:09:09 -0400 |
commit | 54d8e2c323b439e0e20ea44d17b875d9a43f7d66 (patch) | |
tree | 3004e6d801f0cbec1b8a713bfa89d231172a91fd | |
parent | d8e4a88b7974ea03015f515383fb2576fbb517f1 (diff) |
mfd: Add missing #ifdef around tc3589x PM block
The CONFIG_PM code was unconditionally compiled in despite
the dev_pm_ops only being included into the driver struct
if used. Fix this by adding the missing #ifdef.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/tc3589x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index c27e515b0722..de979742c6fc 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c | |||
@@ -357,6 +357,7 @@ static int __devexit tc3589x_remove(struct i2c_client *client) | |||
357 | return 0; | 357 | return 0; |
358 | } | 358 | } |
359 | 359 | ||
360 | #ifdef CONFIG_PM | ||
360 | static int tc3589x_suspend(struct device *dev) | 361 | static int tc3589x_suspend(struct device *dev) |
361 | { | 362 | { |
362 | struct tc3589x *tc3589x = dev_get_drvdata(dev); | 363 | struct tc3589x *tc3589x = dev_get_drvdata(dev); |
@@ -387,6 +388,7 @@ static int tc3589x_resume(struct device *dev) | |||
387 | 388 | ||
388 | static const SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops, tc3589x_suspend, | 389 | static const SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops, tc3589x_suspend, |
389 | tc3589x_resume); | 390 | tc3589x_resume); |
391 | #endif | ||
390 | 392 | ||
391 | static const struct i2c_device_id tc3589x_id[] = { | 393 | static const struct i2c_device_id tc3589x_id[] = { |
392 | { "tc3589x", 24 }, | 394 | { "tc3589x", 24 }, |