diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 12:38:34 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 12:38:34 -0500 |
| commit | 899a1fc084ef3dcb57737d8847bf219cbf353ed3 (patch) | |
| tree | a9dc1c8530524e0ac345f06de6df105f847a7604 /arch/powerpc/mm/init_64.c | |
| parent | c64d472abc68dcad4d34f365545058c3f11973d8 (diff) | |
| parent | 989e4d6cbc69191c41ddf4b1c492457410376b43 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/powerpc/mm/init_64.c')
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 1134f70f231d..81cfb0c2ec58 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c | |||
| @@ -64,7 +64,8 @@ | |||
| 64 | #include <asm/iommu.h> | 64 | #include <asm/iommu.h> |
| 65 | #include <asm/abs_addr.h> | 65 | #include <asm/abs_addr.h> |
| 66 | #include <asm/vdso.h> | 66 | #include <asm/vdso.h> |
| 67 | #include <asm/imalloc.h> | 67 | |
| 68 | #include "mmu_decl.h" | ||
| 68 | 69 | ||
| 69 | #ifdef DEBUG | 70 | #ifdef DEBUG |
| 70 | #define DBG(fmt...) printk(fmt) | 71 | #define DBG(fmt...) printk(fmt) |