From: Linus Walleij Date: Tue, 9 Aug 2011 18:37:17 +0000 (+0200) Subject: mfd: Add missing #ifdef around tc3589x PM block X-Git-Tag: next-20110922~41^2~41 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ffcdded178ddeaca3f643ff69fbf589a84b18a8;p=karo-tx-linux.git 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 Signed-off-by: Samuel Ortiz --- 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 },