diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-10-20 07:16:55 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 08:17:49 +0400 |
| commit | a3ba68f969b2407b6809a840f6ff45ab0eb06f84 (patch) | |
| tree | b05b5640969ca7bd9a1fa0a0510ed3a7e5ae7d5a /arch/powerpc/include/asm/page.h | |
| parent | 0721357d4d04563b6e5c7ffd6b5685df275d5ff9 (diff) | |
| download | linux-a3ba68f969b2407b6809a840f6ff45ab0eb06f84.tar.xz | |
powerpc: Fix build issue with CONFIG_RELOCATABLE=y
There are two issues when we enable CONFIG_RELOCATABLE. The first is due
to the fact that phys_addr_t is now defined in linux/types.h. The second
is due to the fact that the DMA code changes expose memstart_addr to
prom_init.c
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/page.h')
| -rw-r--r-- | arch/powerpc/include/asm/page.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 64e144505f65..120f4d494257 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -12,7 +12,9 @@ #include <asm/asm-compat.h> #include <asm/kdump.h> -#include <asm/types.h> +#ifndef __ASSEMBLY__ +#include <linux/types.h> +#endif /* * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software @@ -73,6 +75,7 @@ #if defined(CONFIG_RELOCATABLE) #ifndef __ASSEMBLY__ + extern phys_addr_t memstart_addr; extern phys_addr_t kernstart_addr; #endif |