diff options
author | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
commit | e86c4b67feb2c984314eef71314f26cfe39fef36 (patch) | |
tree | 3c5a7e2216cdcd1d06b8729bf94eba6dc74a7959 /drivers/mfd/sec-core.c | |
parent | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (diff) | |
parent | 9c602629e34bad88a464e08de08118e80beee0d8 (diff) | |
download | linux-e86c4b67feb2c984314eef71314f26cfe39fef36.tar.xz |
Merge tag 'xtensa-for-next-20140406' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Merging from Max' tree.
Xtensa fixes for 3.15:
- add missing cache manipulation symbol exports to fix build failures;
- sort extable at build time;
- clean up sysmem code, support memmap boot parameter;
- add highmem support for cores with non-aliasing caches;
- add DTS for xtfpga on KC705.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'drivers/mfd/sec-core.c')
-rw-r--r-- | drivers/mfd/sec-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index a139798b8065..714e2135210e 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -315,6 +315,7 @@ static int sec_pmic_remove(struct i2c_client *i2c) return 0; } +#ifdef CONFIG_PM_SLEEP static int sec_pmic_suspend(struct device *dev) { struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); @@ -349,6 +350,7 @@ static int sec_pmic_resume(struct device *dev) return 0; } +#endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(sec_pmic_pm_ops, sec_pmic_suspend, sec_pmic_resume); |