diff options
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 34 |
2 files changed, 1 insertions, 35 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 61713afb1f6..0b9611f636f 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1719,7 +1719,7 @@ static void __init gta02_machine_init(void) platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); - s3c2410_pm_init(); + s3c_pm_init(); /* Make sure the modem can wake us up */ set_irq_type(GTA02_IRQ_MODEM, IRQ_TYPE_EDGE_RISING); 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 |