diff options
| author | Wengang Wu <wgw@motorola.com> | 2014-04-23 09:38:46 -0500 |
|---|---|---|
| committer | Wengang Wu <wgw@motorola.com> | 2014-04-23 16:31:52 +0000 |
| commit | 284a121061cf6c9940708934daabb9083043b29f (patch) | |
| tree | 39efb294878490685ce49bf3d9343ce3b1a55a41 /drivers/video/omap2/dss/core.c | |
| parent | 3474554e21217f8893e1d47ef94b14d22080c265 (diff) | |
| download | olio-linux-3.10-284a121061cf6c9940708934daabb9083043b29f.tar.xz olio-linux-3.10-284a121061cf6c9940708934daabb9083043b29f.zip | |
IKXCLOCK-872 Display: support ambient mode
Change-Id: I0be8a9f1222db527a941de29606cd47aa57b3730
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index e08d71fef88..fc053fe1991 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -216,6 +216,7 @@ static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d) DSSDBG("pm notif %lu\n", v); switch (v) { +#if !defined(CONFIG_HAS_AMBIENTMODE) case PM_SUSPEND_PREPARE: DSSDBG("suspending displays\n"); return dss_suspend_all_devices(); @@ -223,7 +224,7 @@ static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d) case PM_POST_SUSPEND: DSSDBG("resuming displays\n"); return dss_resume_all_devices(); - +#endif default: return 0; } |