Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / arch / arm / plat-s3c24xx / pm.c

diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index d6af308..c6b03f8 100644 (file)
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -612,26 +612,9 @@ static int s3c2410_pm_enter(suspend_state_t state)
        return 0;
 }
 
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-static int s3c2410_pm_prepare(suspend_state_t state)
-{
-       return 0;
-}
-
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-static int s3c2410_pm_finish(suspend_state_t state)
-{
-       return 0;
-}
-
 static struct pm_ops s3c2410_pm_ops = {
-       .prepare        = s3c2410_pm_prepare,
        .enter          = s3c2410_pm_enter,
-       .finish         = s3c2410_pm_finish,
+       .valid          = pm_valid_only_mem,
 };
 
 /* s3c2410_pm_init