From 4907c2418e4794cd2a8bc763ebbafee05d661e60 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 4 Jan 2006 15:55:41 +0000 Subject: [PATCH] --- yaml --- r: 16749 b: refs/heads/master c: b3a962455b106a1677f91c754e5315753c3d44c3 h: refs/heads/master i: 16747: 6fff5b324a756ea53a2d5e7942bc35aa96b78ea8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-sa1100/pm.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 019fbdcbdb45..284c9630074a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7b4a75677f8f2a559b0c55a550b364e79a8d302 +refs/heads/master: b3a962455b106a1677f91c754e5315753c3d44c3 diff --git a/trunk/arch/arm/mach-sa1100/pm.c b/trunk/arch/arm/mach-sa1100/pm.c index 59c7964cfe11..786c8534231f 100644 --- a/trunk/arch/arm/mach-sa1100/pm.c +++ b/trunk/arch/arm/mach-sa1100/pm.c @@ -134,30 +134,12 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } -/* - * Called after processes are frozen, but before we shut down devices. - */ -static int sa11x0_pm_prepare(suspend_state_t state) -{ - return 0; -} - -/* - * Called after devices are re-setup, but before processes are thawed. - */ -static int sa11x0_pm_finish(suspend_state_t state) -{ - return 0; -} - /* * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk. */ static struct pm_ops sa11x0_pm_ops = { .pm_disk_mode = PM_DISK_FIRMWARE, - .prepare = sa11x0_pm_prepare, .enter = sa11x0_pm_enter, - .finish = sa11x0_pm_finish, }; static int __init sa11x0_pm_init(void)