---
 arch/arm/mach-pxa/pxa27x.c  |    4 ++--
 sound/arm/pxa2xx-ac97.c     |    2 +-
 sound/soc/pxa/pxa2xx-ac97.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.21/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux-2.6.21.orig/arch/arm/mach-pxa/pxa27x.c	2007-07-02 09:46:38.000000000 +0100
+++ linux-2.6.21/arch/arm/mach-pxa/pxa27x.c	2007-07-02 09:47:15.000000000 +0100
@@ -142,9 +142,9 @@ void pxa_cpu_pm_enter(suspend_state_t st
 	extern void pxa_cpu_resume(void);
 
 	if (state == PM_SUSPEND_STANDBY)
-		CKEN = CKEN_MEMC | CKEN_OSTIMER | CKEN_LCD | CKEN_PWM0;
+		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | (1 << CKEN_LCD) | (1 << CKEN_PWM0);
 	else
-		CKEN = CKEN_MEMC | CKEN_OSTIMER;
+		CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER);
 
 	/* ensure voltage-change sequencer not initiated, which hangs */
 	PCFR &= ~PCFR_FVC;
Index: linux-2.6.21/sound/arm/pxa2xx-ac97.c
===================================================================
--- linux-2.6.21.orig/sound/arm/pxa2xx-ac97.c	2007-07-02 09:45:16.000000000 +0100
+++ linux-2.6.21/sound/arm/pxa2xx-ac97.c	2007-07-02 09:45:39.000000000 +0100
@@ -361,7 +361,7 @@ static int __devinit pxa2xx_ac97_probe(s
  err:
 	if (card)
 		snd_card_free(card);
-	if (CKEN & CKEN_AC97) {
+	if (CKEN & (1 << CKEN_AC97)) {
 		GCR |= GCR_ACLINK_OFF;
 		free_irq(IRQ_AC97, NULL);
 		pxa_set_cken(CKEN_AC97, 0);
Index: linux-2.6.21/sound/soc/pxa/pxa2xx-ac97.c
===================================================================
--- linux-2.6.21.orig/sound/soc/pxa/pxa2xx-ac97.c	2007-07-02 09:45:49.000000000 +0100
+++ linux-2.6.21/sound/soc/pxa/pxa2xx-ac97.c	2007-07-02 09:46:15.000000000 +0100
@@ -300,7 +300,7 @@ static int pxa2xx_ac97_probe(struct plat
 	return 0;
 
  err:
-	if (CKEN & CKEN_AC97) {
+	if (CKEN & (1 << CKEN_AC97)) {
 		GCR |= GCR_ACLINK_OFF;
 		free_irq(IRQ_AC97, NULL);
 		pxa_set_cken(CKEN_AC97, 0);