From 1b4fb7edcceaf99a571c342c5572e70882d58ee7 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 23 Jan 2008 12:33:31 +0000
Subject: [PATCH] --- yaml --- r: 77575 b: refs/heads/master c:
 fd8e7af8d0fd3febc87607214d5dd545089edc71 h: refs/heads/master i:   77573:
 00be38da5fbbd37ed59f8a689be94bda26d2d06a   77571:
 aabd3ed961b3dcdc21eddb0ff19bef0e8eeac61f   77567:
 29a7615fb529c8177dd62c96530222aaf8635c9f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-pxa/pxa25x.c | 2 --
 trunk/arch/arm/mach-pxa/pxa27x.c | 6 ------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 48436228e791..004206ceba96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5dea12346f98b0624e00ef585246bfec8b0959
+refs/heads/master: fd8e7af8d0fd3febc87607214d5dd545089edc71
diff --git a/trunk/arch/arm/mach-pxa/pxa25x.c b/trunk/arch/arm/mach-pxa/pxa25x.c
index 962cfbb5500e..73a5f068e167 100644
--- a/trunk/arch/arm/mach-pxa/pxa25x.c
+++ b/trunk/arch/arm/mach-pxa/pxa25x.c
@@ -216,8 +216,6 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
 
 static void pxa25x_cpu_pm_enter(suspend_state_t state)
 {
-	CKEN = 0;
-
 	switch (state) {
 	case PM_SUSPEND_MEM:
 		/* set resume return address */
diff --git a/trunk/arch/arm/mach-pxa/pxa27x.c b/trunk/arch/arm/mach-pxa/pxa27x.c
index f33c9d7ff87e..db0c4c6fea9b 100644
--- a/trunk/arch/arm/mach-pxa/pxa27x.c
+++ b/trunk/arch/arm/mach-pxa/pxa27x.c
@@ -265,12 +265,6 @@ void pxa27x_cpu_pm_enter(suspend_state_t state)
 {
 	extern void pxa_cpu_standby(void);
 
-	if (state == PM_SUSPEND_STANDBY)
-		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) |
-			(1 << CKEN_LCD) | (1 << CKEN_PWM0);
-	else
-		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER);
-
 	/* ensure voltage-change sequencer not initiated, which hangs */
 	PCFR &= ~PCFR_FVC;