projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
[powerpc.git]
/
arch
/
powerpc
/
mm
/
pgtable_64.c
diff --git
a/arch/powerpc/mm/pgtable_64.c
b/arch/powerpc/mm/pgtable_64.c
index
c7f7bb6
..
2ffca63
100644
(file)
--- a/
arch/powerpc/mm/pgtable_64.c
+++ b/
arch/powerpc/mm/pgtable_64.c
@@
-64,7
+64,8
@@
#include <asm/iommu.h>
#include <asm/abs_addr.h>
#include <asm/vdso.h>
#include <asm/iommu.h>
#include <asm/abs_addr.h>
#include <asm/vdso.h>
-#include <asm/imalloc.h>
+
+#include "mmu_decl.h"
unsigned long ioremap_bot = IMALLOC_BASE;
static unsigned long phbs_io_bot = PHBS_IO_BASE;
unsigned long ioremap_bot = IMALLOC_BASE;
static unsigned long phbs_io_bot = PHBS_IO_BASE;