diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-07-01 23:52:42 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:12:24 +0100 |
| commit | f928822646fe28b6e547049d94115352657c2442 (patch) | |
| tree | eccdd2c9fc0e25a5d88b9efc0ac7be8a893ae0d8 | |
| parent | 8f53671ec2f88db9d2d8c5da944cc39a6532e760 (diff) | |
| download | kernel_samsung_tuna-f928822646fe28b6e547049d94115352657c2442.zip kernel_samsung_tuna-f928822646fe28b6e547049d94115352657c2442.tar.gz kernel_samsung_tuna-f928822646fe28b6e547049d94115352657c2442.tar.bz2 | |
fix merge error
| -rwxr-xr-x[-rw-r--r--] | drivers/video/omap2/dss/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 1e2d9e2a..4761526 100644..100755 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -318,9 +318,7 @@ static int omap_dss_remove(struct platform_device *pdev) static void omap_dss_shutdown(struct platform_device *pdev) { DSSDBG("shutdown\n"); -#if 0 /* temporary, avoid hang at shutdown */ dss_disable_all_devices(); -#endif } static int omap_dss_suspend(struct platform_device *pdev, pm_message_t state) |