git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c64xx
/
pm.c
diff --git
a/arch/arm/mach-s3c64xx/pm.c
b/arch/arm/mach-s3c64xx/pm.c
index 7d3e81b9dd06229034603aa260064384d8d44a5d..7feb426fc202d10be8f74a8992b5de212b6e4ba0 100644
(file)
--- a/
arch/arm/mach-s3c64xx/pm.c
+++ b/
arch/arm/mach-s3c64xx/pm.c
@@
-365,10
+365,9
@@
static __init int s3c64xx_pm_initcall(void)
}
arch_initcall(s3c64xx_pm_initcall);
-
static __init in
t s3c64xx_pm_late_initcall(void)
+
int __ini
t s3c64xx_pm_late_initcall(void)
{
pm_genpd_poweroff_unused();
return 0;
}
-late_initcall(s3c64xx_pm_late_initcall);