diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-09 20:37:17 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 14:09:09 +0200 |
| commit | 54d8e2c323b439e0e20ea44d17b875d9a43f7d66 (patch) | |
| tree | 3004e6d801f0cbec1b8a713bfa89d231172a91fd /drivers/mfd | |
| parent | mfd: Define asic3 gpio_chip label (diff) | |
| download | linux-54d8e2c323b439e0e20ea44d17b875d9a43f7d66.tar.xz linux-54d8e2c323b439e0e20ea44d17b875d9a43f7d66.zip | |
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>
Diffstat (limited to 'drivers/mfd')
| -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) return 0; } +#ifdef CONFIG_PM static int tc3589x_suspend(struct device *dev) { struct tc3589x *tc3589x = dev_get_drvdata(dev); @@ -387,6 +388,7 @@ static int tc3589x_resume(struct device *dev) static const SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops, tc3589x_suspend, tc3589x_resume); +#endif static const struct i2c_device_id tc3589x_id[] = { { "tc3589x", 24 }, |