diff options
| author | merge <null@invalid> | 2008-12-04 09:33:45 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-04 09:33:45 +0000 |
| commit | 9b2a35dd616a9fbed3e6cd4c1781f5230d118402 (patch) | |
| tree | 66d385a12c999cabe4f54576a70c82153a0b66da /arch/arm/plat-s3c24xx | |
| parent | 0b519f14e15365213924505e2e3019c1ff159aa9 (diff) | |
MERGE-via-pending-tracking-hist-patch-andy-tracking-merge-brea
pending-tracking-hist top was patch-andy-tracking-merge-brea / 2010fb7565e8239f893d3631c3b1ccc7766f26b9 ... parent commitmessage:
From: Werner Almesberger <werner@openmoko.org>
PATCH-andy-tracking-merge-breakage-pending-tracking-fix.patch
Fix merge breakage in pending-tracking. With this patch,
0b519f14e15365213924505e2e3019c1ff159aa9 builds for GTA02 and it
even boots ! ;-)
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index 57062bc4247..6ed53b9b2e5 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c @@ -144,37 +144,3 @@ void s3c_pm_save_core(void) s3c_pm_do_save(misc_save, ARRAY_SIZE(misc_save)); s3c_pm_do_save(core_save, ARRAY_SIZE(core_save)); } - -<<<<<<< current -======= -static int s3c2410_pm_begin(suspend_state_t state) -{ - int ret = 0; - -#ifdef CONFIG_REGULATOR - ret = regulator_suspend_prepare(state); -#endif - return ret; -} - -static struct platform_suspend_ops s3c2410_pm_ops = { - .enter = s3c2410_pm_enter, - .valid = suspend_valid_only_mem, - .begin = s3c2410_pm_begin, -}; - -/* s3c2410_pm_init - * - * Attach the power management functions. This should be called - * from the board specific initialisation if the board supports - * it. -*/ - -int __init s3c2410_pm_init(void) -{ - printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n"); - - suspend_set_ops(&s3c2410_pm_ops); - return 0; -} ->>>>>>> patched |