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 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-qt2410.c
diff --git
a/arch/arm/mach-s3c2410/mach-qt2410.c
b/arch/arm/mach-s3c2410/mach-qt2410.c
index
9678a53
..
9f1ba9b
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/
arch/arm/mach-s3c2410/mach-qt2410.c
@@
-355,7
+355,7
@@
static void __init qt2410_machine_init(void)
s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT);
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
- s3c
2410
_pm_init();
+ s3c_pm_init();
}
MACHINE_START(QT2410, "QT2410")