summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-07 10:03:17 +0100
committerSimone Willett <swillett@nvidia.com>2012-08-02 18:13:40 -0700
commit4cf205f2c1ed24511e672bb8ffb8720516216dc8 (patch)
treef53c3c5f821d9f35f15255124972682d37a6c2ff /drivers/mfd
parent476ce05633d1c2396bcd7292adf47b3c373c6061 (diff)
mfd: Fix tps65090 ifdefs for suspend mode
CONFIG_PM also covers runtime only PM. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Venu Byravarasu <vbyravarasu@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> (Cherry-picked from mainline 1ca5513af77307eccea7efd4d12ef5c14f1b12ab) Change-Id: I5d8d35f72f46dec28d62e6b01fbc915049185ec3 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/120368 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps65090.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index a66d4df51293..ac7e8b1f0034 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -334,7 +334,7 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int tps65090_i2c_suspend(struct i2c_client *client, pm_message_t state)
{
if (client->irq)
@@ -363,7 +363,7 @@ static struct i2c_driver tps65090_driver = {
},
.probe = tps65090_i2c_probe,
.remove = __devexit_p(tps65090_i2c_remove),
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
.suspend = tps65090_i2c_suspend,
.resume = tps65090_i2c_resume,
#endif