git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
pmu.c
diff --git
a/arch/powerpc/platforms/cell/pmu.c
b/arch/powerpc/platforms/cell/pmu.c
index
66ca4b5
..
1ed3036
100644
(file)
--- a/
arch/powerpc/platforms/cell/pmu.c
+++ b/
arch/powerpc/platforms/cell/pmu.c
@@
-30,8
+30,8
@@
#include <asm/pmc.h>
#include <asm/reg.h>
#include <asm/spu.h>
+#include <asm/cell-regs.h>
-#include "cbe_regs.h"
#include "interrupt.h"
/*