git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
cell
/
cbe_cpufreq_pervasive.c
diff --git
a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
b/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
index 163263b3e1cdba667aab23ed162da2b76a6bb55c..70fa7aef5edd9a6404f0fdc7b58e57565903821e 100644
(file)
--- a/
arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ b/
arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
@@
-28,8
+28,8
@@
#include <linux/time.h>
#include <asm/machdep.h>
#include <asm/hw_irq.h>
+#include <asm/cell-regs.h>
-#include "cbe_regs.h"
#include "cbe_cpufreq.h"
/* to write to MIC register */