diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c | |
| parent | trace: clean up funny line breaks in stat_seq_show (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | linux-dev-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz linux-dev-99cd7074891f87c49660e3b2880564324a4733ac.zip | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c index 70fa7aef5edd..20472e487b6f 100644 --- a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c +++ b/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; |