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:
86559f0
)
drivers/base/power/main.c: port rk29 change to plat rk
author
黄涛
<huangtao@rock-chips.com>
Mon, 16 Apr 2012 09:48:41 +0000
(17:48 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Mon, 16 Apr 2012 09:48:41 +0000
(17:48 +0800)
drivers/base/power/main.c
patch
|
blob
|
history
diff --git
a/drivers/base/power/main.c
b/drivers/base/power/main.c
index 0a02634fb0f187cf2b8846264fa40bf63ace569d..7687c5df8ff319e80eb3d91f6061539bb3165f5f 100644
(file)
--- a/
drivers/base/power/main.c
+++ b/
drivers/base/power/main.c
@@
-28,7
+28,7
@@
#include <linux/async.h>
#include <linux/suspend.h>
#include <linux/timer.h>
-#ifdef CONFIG_
ARCH_RK29
+#ifdef CONFIG_
PLAT_RK
#include <linux/console.h>
#endif
@@
-611,7
+611,7
@@
static void dpm_drv_timeout(unsigned long data)
printk(KERN_EMERG "**** DPM device timeout: %s (%s)\n", dev_name(dev),
(dev->driver ? dev->driver->name : "no driver"));
-#ifdef CONFIG_
ARCH_RK29
+#ifdef CONFIG_
PLAT_RK
resume_console();
#endif
printk(KERN_EMERG "dpm suspend stack:\n");