From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 07:59:01 +0000 (+0800)
Subject: Revert "rk29: call resume_console while dpm_drv_timeout, make debug more easy"
X-Git-Tag: firefly_0821_release~10034
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c235653a7600ef2fabcd3a9a34f04d7b99d9903;p=firefly-linux-kernel-4.4.55.git

Revert "rk29: call resume_console while dpm_drv_timeout, make debug more easy"

This reverts commit 1c209c256f686d8e5d806f48ebbe029f4545df8a.
---

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 079024a40a9d..0855a10337ee 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -453,11 +453,6 @@ static void dpm_drv_timeout(unsigned long data)
 	struct device *dev = dpm_drv_wd_data.dev;
 	struct task_struct *tsk = dpm_drv_wd_data.tsk;
 
-#ifdef CONFIG_ARCH_RK29
-#include <linux/console.h>
-	resume_console();
-#endif
-
 	printk(KERN_EMERG "**** DPM device timeout: %s (%s)\n", dev_name(dev),
 	       (dev->driver ? dev->driver->name : "no driver"));