From f033fe5ec4284a5dd48ea2931629dbd954b409ed Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Dec 2008 17:09:15 +0000
Subject: [PATCH] --- yaml --- r: 127677 b: refs/heads/master c:
 54cfd0d5cac9df4f7b32969156a55f7e0d9297ad h: refs/heads/master i:   127675:
 3fb9f4b6cc1d49c2811a5037e984175b441097cd v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c3b5425db77..3b3fba56f9ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee418b8646d5d6dc2df343ffaefd2b74940d0048
+refs/heads/master: 54cfd0d5cac9df4f7b32969156a55f7e0d9297ad
diff --git a/trunk/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/trunk/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
index 70fa7aef5edd..20472e487b6f 100644
--- a/trunk/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ b/trunk/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
@@ -54,7 +54,7 @@ int cbe_cpufreq_set_pmode(int cpu, unsigned int pmode)
 {
 	struct cbe_pmd_regs __iomem *pmd_regs;
 	struct cbe_mic_tm_regs __iomem *mic_tm_regs;
-	u64 flags;
+	unsigned long flags;
 	u64 value;
 #ifdef DEBUG
 	long time;