Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

[linux-2.6-omap-h63xx.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 3d4837021ac71ee85046b8dca99f08a3e042be64..1a8347cec20a3da803ecaf5c7f8dba269a2270ee 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));
 
-       s3c2410_pm_init();
+       s3c_pm_init();
 }