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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c24xx
/
common-smdk.c
diff --git
a/arch/arm/plat-s3c24xx/common-smdk.c
b/arch/arm/plat-s3c24xx/common-smdk.c
index
3d48370
..
1a8347c
100644
(file)
--- a/
arch/arm/plat-s3c24xx/common-smdk.c
+++ b/
arch/arm/plat-s3c24xx/common-smdk.c
@@
-201,5
+201,5
@@
void __init smdk_machine_init(void)
platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));
- s3c
2410
_pm_init();
+ s3c_pm_init();
}