Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

[pandora-kernel.git] / arch / arm / mach-s3c2412 / mach-jive.c

diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index ecddbbb..72c266a 100644 (file)
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -494,7 +494,7 @@ static int jive_pm_suspend(struct sys_device *sd, pm_message_t state)
         * correct address to resume from. */
 
        __raw_writel(0x2BED, S3C2412_INFORM0);
-       __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2412_INFORM1);
+       __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);
 
        return 0;
 }
@@ -630,7 +630,7 @@ static void __init jive_machine_init(void)
 
        /* initialise the power management now we've setup everything. */
 
-       s3c2410_pm_init();
+       s3c_pm_init();
 
        s3c_device_nand.dev.platform_data = &jive_nand_info;