git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c24xx
/
pm-simtec.c
diff --git
a/arch/arm/plat-s3c24xx/pm-simtec.c
b/arch/arm/plat-s3c24xx/pm-simtec.c
index
21dfa74
..
da0d321
100644
(file)
--- a/
arch/arm/plat-s3c24xx/pm-simtec.c
+++ b/
arch/arm/plat-s3c24xx/pm-simtec.c
@@
-61,7
+61,7
@@
static __init int pm_simtec_init(void)
__raw_writel(gstatus4, S3C2410_GSTATUS4);
__raw_writel(gstatus4, S3C2410_GSTATUS4);
- return s3c
2410
_pm_init();
+ return s3c_pm_init();
}
arch_initcall(pm_simtec_init);
}
arch_initcall(pm_simtec_init);