projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e041b29
)
Revert "rk29: call resume_console while dpm_drv_timeout, make debug more easy"
author
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 07:59:01 +0000
(15:59 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 07:59:01 +0000
(15:59 +0800)
This reverts commit
1c209c256f686d8e5d806f48ebbe029f4545df8a
.
drivers/base/power/main.c
patch
|
blob
|
history
diff --git
a/drivers/base/power/main.c
b/drivers/base/power/main.c
index 079024a40a9da7093cc8bdfafb4707245a6dd3e5..0855a10337ee00f6b8d2c526d82d3c8695c7380a 100644
(file)
--- 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"));