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:
d9d83f6
)
Revert "rk29: pm: disable console suspend for debug"
author
黄涛
<huangtao@rock-chips.com>
Mon, 14 Feb 2011 07:29:13 +0000
(15:29 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Mon, 14 Feb 2011 07:29:13 +0000
(15:29 +0800)
This reverts commit
1041014f366b440ea15d8a9d88b5e0c6831ede82
.
arch/arm/mach-rk29/pm.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-rk29/pm.c
b/arch/arm/mach-rk29/pm.c
index 05495b52a5e77c5d9f8f9750db0bd870d2f2b40f..09128ab22dd947c9f51293094b540aa81334674a 100644
(file)
--- a/
arch/arm/mach-rk29/pm.c
+++ b/
arch/arm/mach-rk29/pm.c
@@
-8,7
+8,6
@@
#include <linux/regulator/consumer.h>
#include <linux/io.h>
#include <linux/wakelock.h>
-#include <linux/console.h>
#include <mach/rk29_iomap.h>
#include <mach/cru.h>
@@
-235,9
+234,6
@@
static int __init rk29_pm_init(void)
/* set idle function */
pm_idle = rk29_idle;
- /* for debug */
- console_suspend_enabled = 0;
-
return 0;
}
__initcall(rk29_pm_init);