add back android pm entries so that we support different pm path according MACRO
authorAustin, Zhang <austin.zhang@intel.com>
Mon, 28 May 2012 11:03:07 +0000 (19:03 +0800)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 12 Jul 2012 11:45:43 +0000 (14:45 +0300)
Signed-off-by: Austin Zhang <austin.zhang@intel.com>
drivers/staging/mrst/drv/psb_drv.c

index 7305bcc..045836b 100644 (file)
@@ -2371,8 +2371,13 @@ static const struct dev_pm_ops psb_pm_ops = {
        .runtime_suspend = psb_runtime_suspend,
        .runtime_resume = psb_runtime_resume,
        .runtime_idle = psb_runtime_idle,
+#ifdef CONFIG_HAS_EARLYSUSPEND
+       .resume = ospm_power_resume,
+       .suspend = ospm_power_suspend,
+#else
        .resume = gfx_resume,
        .suspend = gfx_suspend,
+#endif
 };
 
 static struct drm_driver driver = {