projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux.git]
/
arch
/
arm
/
mach-s5p64x0
/
pm.c
diff --git
a/arch/arm/mach-s5p64x0/pm.c
b/arch/arm/mach-s5p64x0/pm.c
index 861e15cea691e62331e293b9639e7d1eb1f07bcb..ec8229cee716fd634a4fb45bf6b1b2016156fc00 100644
(file)
--- a/
arch/arm/mach-s5p64x0/pm.c
+++ b/
arch/arm/mach-s5p64x0/pm.c
@@
-161,7
+161,6
@@
static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif)
{
pm_cpu_prep = s5p64x0_pm_prepare;
pm_cpu_sleep = s5p64x0_cpu_suspend;
- pm_uart_udivslot = 1;
return 0;
}